---

yaml --- r: 354695 b: refs/heads/master c: b16604f h: refs/heads/master i: 354693: 18efd27 354691: 57778bb 354687: 2702aa0 v: v3
git-mirror · Jan 25, 2013 · e888fdf · e888fdf
1 parent 289c1a3
commit e888fdf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c11747f6ce70253dbf73709bb0a5ff19acc48ec8
+refs/heads/master: b16604f2c1dc3f0a326818b282e6bb5f363f725e
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
@@ -345,7 +345,12 @@ static int omap2430_musb_init(struct musb *musb)
 	 * up through ULPI.  TWL4030-family PMICs include one,
 	 * which needs a driver, drivers aren't always needed.
 	 */
-	musb->xceiv = devm_usb_get_phy_dev(dev, 0);
+	if (dev->parent->of_node)
+		musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent,
+		    "usb-phy", 0);
+	else
+		musb->xceiv = devm_usb_get_phy_dev(dev, 0);
+
 	if (IS_ERR_OR_NULL(musb->xceiv)) {
 		pr_err("HS USB OTG: no transceiver configured\n");
 		return -ENODEV;