diff options
author | Sergey Shtylyov <s.shtylyov@omp.ru> | 2023-06-17 23:36:22 +0300 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-06-19 13:32:39 +0200 |
commit | 413db499730248431c1005b392e8ed82c4fa19bf (patch) | |
tree | 96eeb0bb529922a40f715d50ac592e8d249c40d8 /drivers/mmc/host | |
parent | c2df53c5806cfd746dae08e07bc8c4ad247c3b70 (diff) | |
download | linux-stable-413db499730248431c1005b392e8ed82c4fa19bf.tar.gz linux-stable-413db499730248431c1005b392e8ed82c4fa19bf.tar.bz2 linux-stable-413db499730248431c1005b392e8ed82c4fa19bf.zip |
mmc: usdhi60rol0: fix deferred probing
The driver overrides the error codes returned by platform_get_irq_byname()
to -ENODEV, so if it returns -EPROBE_DEFER, the driver will fail the probe
permanently instead of the deferred probing. Switch to propagating 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-13-s.shtylyov@omp.ru
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r-- | drivers/mmc/host/usdhi6rol0.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c index 2f59917b105e..2e17903658fc 100644 --- a/drivers/mmc/host/usdhi6rol0.c +++ b/drivers/mmc/host/usdhi6rol0.c @@ -1757,8 +1757,10 @@ static int usdhi6_probe(struct platform_device *pdev) irq_cd = platform_get_irq_byname(pdev, "card detect"); irq_sd = platform_get_irq_byname(pdev, "data"); irq_sdio = platform_get_irq_byname(pdev, "SDIO"); - if (irq_sd < 0 || irq_sdio < 0) - return -ENODEV; + if (irq_sd < 0) + return irq_sd; + if (irq_sdio < 0) + return irq_sdio; mmc = mmc_alloc_host(sizeof(struct usdhi6_host), dev); if (!mmc) |