Merge remote-tracking branch 'at91/at91-next'

[karo-tx-linux.git] / drivers / ata / pata_at91.c

diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index 3f4c2613b3dfa1a2f672bbb6d86383dc2e58d029..782281312abc822019f18a7bb96fe1681730101d 100644 (file)
--- 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;
 
-       return 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);
 
 err_put: