mmc: usdhi60rol0: fix deferred probing
authorSergey Shtylyov <s.shtylyov@omp.ru>
Sat, 17 Jun 2023 20:36:22 +0000 (23:36 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Jun 2023 09:12:31 +0000 (11:12 +0200)
[ Upstream commit 413db499730248431c1005b392e8ed82c4fa19bf ]

The driver overrides the error codes returned by platform_get_irq_byname()
to -ENODEV, so if it returns -EPROBE_DEFER, the driver will fail the probe
permanently instead of the deferred probing.  Switch to propagating error
codes upstream.

Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq")
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20230617203622.6812-13-s.shtylyov@omp.ru
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mmc/host/usdhi6rol0.c

index 99515be..2032e4e 100644 (file)
@@ -1757,8 +1757,10 @@ static int usdhi6_probe(struct platform_device *pdev)
        irq_cd = platform_get_irq_byname(pdev, "card detect");
        irq_sd = platform_get_irq_byname(pdev, "data");
        irq_sdio = platform_get_irq_byname(pdev, "SDIO");
-       if (irq_sd < 0 || irq_sdio < 0)
-               return -ENODEV;
+       if (irq_sd < 0)
+               return irq_sd;
+       if (irq_sdio < 0)
+               return irq_sdio;
 
        mmc = mmc_alloc_host(sizeof(struct usdhi6_host), dev);
        if (!mmc)