---

yaml
---
r: 200675
b: refs/heads/master
c: 4c9715d
h: refs/heads/master
i:
  200673: b57a394
  200671: 8833c4a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b4a036722cfab2b3922685ad473fac35a55c3fa
+refs/heads/master: 4c9715de52b9b6256bf1e9510917111a47b0c176

trunk/drivers/usb/host/ehci-mxc.c

@@ -207,10 +207,17 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
 	/* Initialize the transceiver */
 	if (pdata->otg) {
 		pdata->otg->io_priv = hcd->regs + ULPI_VIEWPORT_OFFSET;
-		if (otg_init(pdata->otg) != 0)
-			dev_err(dev, "unable to init transceiver\n");
-		else if (otg_set_vbus(pdata->otg, 1) != 0)
+		ret = otg_init(pdata->otg);
+		if (ret) {
+			dev_err(dev, "unable to init transceiver, probably missing\n");
+			ret = -ENODEV;
+			goto err_add;
+		}
+		ret = otg_set_vbus(pdata->otg, 1);
+		if (ret) {
 			dev_err(dev, "unable to enable vbus on transceiver\n");
+			goto err_add;
+		}
 	}
 
 	priv->hcd = hcd;