From: Felipe Balbi <balbi@ti.com>
Date: Fri, 15 Mar 2013 08:57:40 +0000 (+0200)
Subject: usb: musb: omap2430: fix PHY error handling
X-Git-Tag: v3.10-rc1~190^2~63^2~83
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a90199bb947856c24d7bf78845d24f802e09db0a;p=~emulex%2Finfiniband.git

usb: musb: omap2430: fix PHY error handling

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 <balbi@ti.com>
---

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index ec460eaed84..798e029e3db 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;
 	}