From c74381d652a03cc7051ec144b5aeecfcc3d376d3 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Fri, 15 Mar 2013 10:57:40 +0200
Subject: [PATCH] --- yaml --- r: 364743 b: refs/heads/master c:
 a90199bb947856c24d7bf78845d24f802e09db0a h: refs/heads/master i:   364741:
 544c8a5ef62c2e5738e056fcfbee42157054ab75   364739:
 d4b438c3fb78aefb2009d49b0532403ac2289b6a   364735:
 8697e020f9b70433e109146852688e1a8c4bc37f v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/musb/omap2430.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 82a5ef2b1403..9d505c1b8b15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4f5ba5e7d9e087f044fe87f5a5421761274aa48
+refs/heads/master: a90199bb947856c24d7bf78845d24f802e09db0a
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index ec460eaed842..798e029e3db0 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/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;
 	}