| Message ID | 20211210204634.8182-4-s.shtylyov@omp.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix deferred probing in the USB host/gadget drivers | expand |
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 3626758b3e2a..36ea4febe29b 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c @@ -222,8 +222,8 @@ static int ehci_orion_drv_probe(struct platform_device *pdev) pr_debug("Initializing Orion-SoC USB Host Controller\n"); irq = platform_get_irq(pdev, 0); - if (irq <= 0) { - err = -ENODEV; + if (irq < 0) { + err = irq; goto err; }
The driver overrides the error codes and IRQ0 returned by platform_get_irq() to -ENODEV, 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. IRQ0 is no longer returned by platform_get_irq(), so we now can safely ignore it... Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> Acked-by: Alan Stern <stern@rowland.harvard.edu> --- Changes in version 3: - corrected the "Fixes:" tag; - added Alan's ACK. Changes in version 2: - removed the check for IRQ0, updated the patch description accordingly. drivers/usb/host/ehci-orion.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)