From 6d5d15313b711c34648fe953a95e9a8f69959878 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Mon, 2 Jul 2012 12:20:24 +0530
Subject: [PATCH] --- yaml --- r: 316981 b: refs/heads/master c:
 f8ecf829481b2cc7301a811da9d2df53ef174977 h: refs/heads/master i:   316979:
 a36a28702aca7df186000f9e90895cac99bb4d6c v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/usb/otg/otg.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e395b6444d83..b2050e24a646 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ded017ee6c7b90f7356bd8488f8af1c10ba90490
+refs/heads/master: f8ecf829481b2cc7301a811da9d2df53ef174977
diff --git a/trunk/drivers/usb/otg/otg.c b/trunk/drivers/usb/otg/otg.c
index 88d62b16f632..1bf60a22595c 100644
--- a/trunk/drivers/usb/otg/otg.c
+++ b/trunk/drivers/usb/otg/otg.c
@@ -98,11 +98,12 @@ struct usb_phy *usb_get_phy(enum usb_phy_type type)
 	if (IS_ERR(phy)) {
 		pr_err("unable to find transceiver of type %s\n",
 			usb_phy_type_string(type));
-		return phy;
+		goto err0;
 	}
 
 	get_device(phy->dev);
 
+err0:
 	spin_unlock_irqrestore(&phy_lock, flags);
 
 	return phy;