From d2ecddf9b818d33d418a4edc22e5fc97f1d32c86 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Tue, 15 Jun 2010 12:34:23 +0200 Subject: [PATCH] --- yaml --- r: 200675 b: refs/heads/master c: 4c9715de52b9b6256bf1e9510917111a47b0c176 h: refs/heads/master i: 200673: b57a394c0c368711f6b46a0570e1a831229de263 200671: 8833c4afad3c20124bdb7de91bbd1411fa0dd7a4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-mxc.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9f64c4a3ef69..5a760afd7304 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b4a036722cfab2b3922685ad473fac35a55c3fa +refs/heads/master: 4c9715de52b9b6256bf1e9510917111a47b0c176 diff --git a/trunk/drivers/usb/host/ehci-mxc.c b/trunk/drivers/usb/host/ehci-mxc.c index 544ccfd7056e..bd4027745aa7 100644 --- a/trunk/drivers/usb/host/ehci-mxc.c +++ b/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;