diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-09-19 15:29:53 +0800 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 15:46:15 +0000 |
| commit | 477c87e90853d136b188c50c0e4a93d01cad872e (patch) | |
| tree | e795ddad10a13779be77c0297616ea1177ba5fac | |
| parent | cc9f9aef6ad3ebdda911e25b38222c215f7634f9 (diff) | |
| download | blackbird-op-linux-477c87e90853d136b188c50c0e4a93d01cad872e.tar.gz blackbird-op-linux-477c87e90853d136b188c50c0e4a93d01cad872e.zip | |
ARM: at91/pata: use gpio_is_valid to check the gpio
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | drivers/ata/pata_at91.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c index a76f24a8e5db..5249e6d918a3 100644 --- a/drivers/ata/pata_at91.c +++ b/drivers/ata/pata_at91.c @@ -360,7 +360,7 @@ static int __devinit pata_at91_probe(struct platform_device *pdev) ap->flags |= ATA_FLAG_SLAVE_POSS; ap->pio_mask = ATA_PIO4; - if (!irq) { + if (!gpio_is_valid(irq)) { ap->flags |= ATA_FLAG_PIO_POLLING; ata_port_desc(ap, "no IRQ, using PIO polling"); } @@ -414,8 +414,8 @@ static int __devinit pata_at91_probe(struct platform_device *pdev) host->private_data = info; - ret = ata_host_activate(host, irq ? gpio_to_irq(irq) : 0, - irq ? ata_sff_interrupt : NULL, + return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0, + gpio_is_valid(irq) ? ata_sff_interrupt : NULL, irq_flags, &pata_at91_sht); if (!ret) |
