Skip to content

Commit fb51b74

Browse files
Sergey Shtylyovstorulf
authored andcommitted
mmc: omap_hsmmc: fix deferred probing
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: 9ec36ca ("of/irq: do irq resolution in platform_get_irq") Signed-off-by: Sergey Shtylyov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent aedf4ba commit fb51b74

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/mmc/host/omap_hsmmc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,9 +1791,11 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
17911791
}
17921792

17931793
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1794-
irq = platform_get_irq(pdev, 0);
1795-
if (res == NULL || irq < 0)
1794+
if (!res)
17961795
return -ENXIO;
1796+
irq = platform_get_irq(pdev, 0);
1797+
if (irq < 0)
1798+
return irq;
17971799

17981800
base = devm_ioremap_resource(&pdev->dev, res);
17991801
if (IS_ERR(base))

0 commit comments

Comments
 (0)