From 3057c2802cd81f43b6abe13e976332b47fdc3422 Mon Sep 17 00:00:00 2001 From: Ajay Kumar Gupta Date: Thu, 18 Mar 2010 16:58:35 +0530 Subject: [PATCH] --- yaml --- r: 190158 b: refs/heads/master c: 18f91196b6e7994bd694a96a6c3b0ac1f3e81d82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-omap.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ab2603d1fb27..bb719830a769 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c1f5c88aaffacb2831353b6d3c1557be52071a2 +refs/heads/master: 18f91196b6e7994bd694a96a6c3b0ac1f3e81d82 diff --git a/trunk/drivers/usb/host/ehci-omap.c b/trunk/drivers/usb/host/ehci-omap.c index a67a0030dd57..40a858335035 100644 --- a/trunk/drivers/usb/host/ehci-omap.c +++ b/trunk/drivers/usb/host/ehci-omap.c @@ -629,11 +629,13 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) } snprintf(supply, sizeof(supply), "hsusb%d", i); omap->regulator[i] = regulator_get(omap->dev, supply); - if (IS_ERR(omap->regulator[i])) + if (IS_ERR(omap->regulator[i])) { + omap->regulator[i] = NULL; dev_dbg(&pdev->dev, "failed to get ehci port%d regulator\n", i); - else + } else { regulator_enable(omap->regulator[i]); + } } ret = omap_start_ehc(omap, hcd);