36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sergey Shtylyov <s.shtylyov@omp.ru>
|
||
|
|
Date: Fri, 24 Dec 2021 06:09:57 +0000
|
||
|
|
Subject: mmc: meson-gx: fix deferred probing
|
||
|
|
|
||
|
|
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. IRQ0 is no longer returned by platform_get_irq(), so we now
|
||
|
|
can safely ignore it...
|
||
|
|
|
||
|
|
Fixes: cbcaac6d7dd2 ("mmc: meson-gx-mmc: Fix platform_get_irq's error checking")
|
||
|
|
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
|
||
|
|
---
|
||
|
|
drivers/mmc/host/meson-gx-mmc.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
|
||
|
|
index 5c94ad4661ce..64a1520321b0 100644
|
||
|
|
--- a/drivers/mmc/host/meson-gx-mmc.c
|
||
|
|
+++ b/drivers/mmc/host/meson-gx-mmc.c
|
||
|
|
@@ -1233,8 +1233,8 @@ static int meson_mmc_probe(struct platform_device *pdev)
|
||
|
|
}
|
||
|
|
|
||
|
|
host->irq = platform_get_irq(pdev, 0);
|
||
|
|
- if (host->irq <= 0) {
|
||
|
|
- ret = -EINVAL;
|
||
|
|
+ if (host->irq < 0) {
|
||
|
|
+ ret = host->irq;
|
||
|
|
goto free_host;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
Armbian
|
||
|
|
|