]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pata_rb532_cf: fix deferred probing
authorSergey Shtylyov <s.shtylyov@omprussia.ru>
Mon, 15 Mar 2021 11:46:53 +0000 (14:46 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:22:33 +0000 (16:22 +0200)
[ Upstream commit 2d3a62fbae8e5badc2342388f65ab2191c209cc0 ]

The driver overrides the error codes returned by platform_get_irq() to
-ENOENT, so if it returns -EPROBE_DEFER, the driver would fail the probe
permanently instead of the deferred probing. Switch to propagating the
error code upstream, still checking/overriding IRQ0 as libata regards it
as "no IRQ" (thus polling) anyway...

Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq")
Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Link: https://lore.kernel.org/r/771ced55-3efb-21f5-f21c-b99920aae611@omprussia.ru
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/ata/pata_rb532_cf.c

index c8b6a780a29050775f66ec60bc89773d71677683..76c550e160f6e650b9c604a09845e614fe0f200c 100644 (file)
@@ -120,10 +120,12 @@ static int rb532_pata_driver_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq <= 0) {
+       if (irq < 0) {
                dev_err(&pdev->dev, "no IRQ resource found\n");
-               return -ENOENT;
+               return irq;
        }
+       if (!irq)
+               return -EINVAL;
 
        pdata = dev_get_platdata(&pdev->dev);
        if (!pdata) {