From 57a6dc73e01d247275a6327e4c2183ae533e4bc7 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Fri, 26 Apr 2013 14:27:09 +0800
Subject: [PATCH] --- yaml --- r: 375959 b: refs/heads/master c:
 4b7e450fb5cefb5865c77999a675330206ab3b8a h: refs/heads/master i:   375957:
 8eab55eb1214d082439bb61d5be6985c34ab3e9d   375955:
 79f4850450f1a5f7b7403aa79bf2c1447e9dba60   375951:
 14dafde6551e342c43b22124994a4da819a444da v: v3

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

diff --git a/[refs] b/[refs]
index be5b9fd31bf5..25653f59b968 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8c18883ba8b8c7f2d9d463c8cf948b944e3c2df
+refs/heads/master: 4b7e450fb5cefb5865c77999a675330206ab3b8a
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index 3551f1a30c65..628b93fe5ccc 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -549,7 +549,8 @@ static int omap2430_probe(struct platform_device *pdev)
 		glue->control_otghs = omap_get_control_dev();
 		if (IS_ERR(glue->control_otghs)) {
 			dev_vdbg(&pdev->dev, "Failed to get control device\n");
-			return -ENODEV;
+			ret = PTR_ERR(glue->control_otghs);
+			goto err2;
 		}
 	} else {
 		glue->control_otghs = ERR_PTR(-ENODEV);