summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Shtylyov <s.shtylyov@omp.ru>2023-06-17 23:36:17 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-06-28 10:29:47 +0200
commit41f1e8dab08d3b40ad905646b9a7c9643c09b8a0 (patch)
tree64a47091c2ebf25de555348018de163c4b0554bb
parentb86ca9e08ca9c24ccda971c8c61eebce4ac35155 (diff)
downloadlinux-41f1e8dab08d3b40ad905646b9a7c9643c09b8a0.tar.gz
linux-41f1e8dab08d3b40ad905646b9a7c9643c09b8a0.tar.bz2
linux-41f1e8dab08d3b40ad905646b9a7c9643c09b8a0.zip
mmc: owl: fix deferred probing
[ Upstream commit 3c482e1e830d79b9be8afb900a965135c01f7893 ] The driver overrides the error codes 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. Fixes: ff65ffe46d28 ("mmc: Add Actions Semi Owl SoCs SD/MMC driver") Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> Link: https://lore.kernel.org/r/20230617203622.6812-8-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/owl-mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/owl-mmc.c b/drivers/mmc/host/owl-mmc.c
index 3dc143b03939..679b8b0b310e 100644
--- a/drivers/mmc/host/owl-mmc.c
+++ b/drivers/mmc/host/owl-mmc.c
@@ -638,7 +638,7 @@ static int owl_mmc_probe(struct platform_device *pdev)
owl_host->irq = platform_get_irq(pdev, 0);
if (owl_host->irq < 0) {
- ret = -EINVAL;
+ ret = owl_host->irq;
goto err_release_channel;
}