mmc: meson-gx: fix deferred probing
authorSergey Shtylyov <s.shtylyov@omp.ru>
Sat, 17 Jun 2023 20:36:12 +0000 (23:36 +0300)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 19 Jun 2023 11:31:12 +0000 (13:31 +0200)
The driver overrides the error codes and IRQ0 returned by platform_get_irq()
to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe
permanently instead of the deferred probing. Switch to propagating the error
codes upstream.  Since commit ce753ad1549c ("platform: finally disallow IRQ0
in platform_get_irq() and its ilk") IRQ0 is no longer returned by those APIs,
so we now can safely ignore it...

Fixes: cbcaac6d7dd2 ("mmc: meson-gx-mmc: Fix platform_get_irq's error checking")
Cc: stable@vger.kernel.org # v5.19+
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230617203622.6812-3-s.shtylyov@omp.ru
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/meson-gx-mmc.c

index f90b0fd..ee9a25b 100644 (file)
@@ -1186,8 +1186,8 @@ static int meson_mmc_probe(struct platform_device *pdev)
                return PTR_ERR(host->regs);
 
        host->irq = platform_get_irq(pdev, 0);
-       if (host->irq <= 0)
-               return -EINVAL;
+       if (host->irq < 0)
+               return host->irq;
 
        cd_irq = platform_get_irq_optional(pdev, 1);
        mmc_gpio_set_cd_irq(mmc, cd_irq);