| Message ID | 20211021191437.8737-7-s.shtylyov@omp.ru (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix deferred probing in the USB host/gadget drivers | expand |
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c index c25c51d26f26..8ce880610212 100644 --- a/drivers/usb/host/ehci-sh.c +++ b/drivers/usb/host/ehci-sh.c @@ -82,8 +82,12 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev) return -ENODEV; irq = platform_get_irq(pdev, 0); - if (irq <= 0) { - ret = -ENODEV; + if (irq < 0) { + ret = irq; + goto fail_create_hcd; + } + if (!irq) { + ret = -EINVAL; goto fail_create_hcd; }
The driver overrides the error codes (and also 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 -- that means we have to explicitly filter out IRQ0 as bad since usb_add_hcd() doesn't quite like it... :-) Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> --- drivers/usb/host/ehci-sh.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)