PHY layer no longer returns NULL. It will
return -ENXIO when PHY layer isn't enabled
and we can use that to bail out instead of
request a probe deferral.

Signed-off-by: Felipe Balbi <ba...@ti.com>
---
 drivers/usb/musb/omap2430.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index ec460ea..798e029 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -353,7 +353,12 @@ static int omap2430_musb_init(struct musb *musb)
        else
                musb->xceiv = devm_usb_get_phy_dev(dev, 0);
 
-       if (IS_ERR_OR_NULL(musb->xceiv)) {
+       if (IS_ERR(musb->xceiv)) {
+               status = PTR_ERR(musb->xceiv);
+
+               if (status == -ENXIO)
+                       return status;
+
                pr_err("HS USB OTG: no transceiver configured\n");
                return -EPROBE_DEFER;
        }
-- 
1.8.2

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to