From 4aeddde57b43224db953118fd44f01981da1a8eb Mon Sep 17 00:00:00 2001
From: Russ Dill <Russ.Dill@ti.com>
Date: Thu, 21 Jun 2012 03:44:31 -0700
Subject: [PATCH] --- yaml --- r: 316882 b: refs/heads/master c:
 984e97483a143f95d861b7218161ae033df293ab h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/host/ehci-omap.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99efb26c2b35..a3b2a702c823 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a46af4ebf9ffec35eea0390e89935197b833dc61
+refs/heads/master: 984e97483a143f95d861b7218161ae033df293ab
diff --git a/trunk/drivers/usb/host/ehci-omap.c b/trunk/drivers/usb/host/ehci-omap.c
index 17cfb8a1131c..6e15fc87cf60 100644
--- a/trunk/drivers/usb/host/ehci-omap.c
+++ b/trunk/drivers/usb/host/ehci-omap.c
@@ -347,7 +347,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 	ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (ret) {
 		dev_err(dev, "failed to add hcd with err %d\n", ret);
-		goto err_add_hcd;
+		goto err_pm_runtime;
 	}
 
 	/* root ports should always stay powered */
@@ -424,8 +424,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 	clk_put(utmi_p1_fck);
 
 err_add_hcd:
+	usb_remove_hcd(hcd);
+
+err_pm_runtime:
 	disable_put_regulator(pdata);
 	pm_runtime_put_sync(dev);
+	usb_put_hcd(hcd);
 
 err_io:
 	iounmap(regs);