Merge tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / ata / pata_arasan_cf.c

diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index e9cf31f..63f3944 100644 (file)
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -818,12 +818,19 @@ static int arasan_cf_probe(struct platform_device *pdev)
        else
                quirk = CF_BROKEN_UDMA; /* as it is on spear1340 */
 
-       /* if irq is 0, support only PIO */
-       acdev->irq = platform_get_irq(pdev, 0);
-       if (acdev->irq)
+       /*
+        * If there's an error getting IRQ (or we do get IRQ0),
+        * support only PIO
+        */
+       ret = platform_get_irq(pdev, 0);
+       if (ret > 0) {
+               acdev->irq = ret;
                irq_handler = arasan_cf_interrupt;
-       else
+       } else  if (ret == -EPROBE_DEFER) {
+               return ret;
+       } else  {
                quirk |= CF_BROKEN_MWDMA | CF_BROKEN_UDMA;
+       }
 
        acdev->pbase = res->start;
        acdev->vbase = devm_ioremap(&pdev->dev, res->start,