]> git.itanic.dy.fi Git - linux-stable/commitdiff
mmc: owl: fix deferred probing
authorSergey Shtylyov <s.shtylyov@omp.ru>
Sat, 17 Jun 2023 20:36:17 +0000 (23:36 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Jun 2023 09:14:13 +0000 (11:14 +0200)
[ 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>
drivers/mmc/host/owl-mmc.c

index 3dc143b0393972bcd4fff3bb77b5e106dc6cd989..679b8b0b310e57a35e59b060f66e54e9e5990802 100644 (file)
@@ -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;
        }