Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee155675 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Greg Kroah-Hartman
Browse files

mmc: usdhi60rol0: fix deferred probing 



[ Upstream commit 413db499730248431c1005b392e8ed82c4fa19bf ]

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: 9ec36caf ("of/irq: do irq resolution in platform_get_irq")
Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20230617203622.6812-13-s.shtylyov@omp.ru


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0bd483fb

drivers/mmc/host/usdhi6rol0.c

+4 −2
Original line number Diff line number Diff line
@@ -1743,8 +1743,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)