summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Shtylyov <s.shtylyov@omp.ru>2023-06-17 23:36:15 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-06-28 10:28:11 +0200
commit65d9318e3d564e54451a82f3267b453664a4c7b6 (patch)
tree5e888f040d05d40aafa78692c52f46afb3ac76ce
parent9ad3c21fb66dcf9c0154f65ae2dfc5b9a6eb77be (diff)
downloadlinux-65d9318e3d564e54451a82f3267b453664a4c7b6.tar.gz
linux-65d9318e3d564e54451a82f3267b453664a4c7b6.tar.bz2
linux-65d9318e3d564e54451a82f3267b453664a4c7b6.zip
mmc: omap: fix deferred probing
[ Upstream commit aedf4ba1ad00aaa94c1b66c73ecaae95e2564b95 ] The driver overrides the error codes returned by platform_get_irq() to -ENXIO, 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. 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-6-s.shtylyov@omp.ru Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/mmc/host/omap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 6aa0537f1f84..eb978b75d8e7 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1344,7 +1344,7 @@ static int mmc_omap_probe(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0);
if (irq < 0)
- return -ENXIO;
+ return irq;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
host->virt_base = devm_ioremap_resource(&pdev->dev, res);