From 9f864a8ce1eae77f1613422d6dc78c882c080e2a Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@iseebcn.com>
Date: Thu, 16 Aug 2012 13:00:25 +0200
Subject: [PATCH] --- yaml --- r: 325987 b: refs/heads/master c:
 10770c5aa0fe686014e9c15906a3ff702a4b0baf h: refs/heads/master i:   325985:
 8bc6bb1d7abd19179a734804b84c073a48ad5166   325983:
 fa10887d376f097b87f1ee361701c84b27c709aa v: v3

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

diff --git a/[refs] b/[refs]
index ea2abc558fff..97fe265134c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12a19b5f836c1a1b838e668f9aa804d017d8c58b
+refs/heads/master: 10770c5aa0fe686014e9c15906a3ff702a4b0baf
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index af5f4214673d..02c39a72b27e 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -141,7 +141,6 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
 	struct usb_otg	*otg = musb->xceiv->otg;
 	u8		devctl;
 	unsigned long timeout = jiffies + msecs_to_jiffies(1000);
-	int ret = 1;
 	/* HDRC controls CPEN, but beware current surges during device
 	 * connect.  They can trigger transient overcurrent conditions
 	 * that must be ignored.
@@ -168,12 +167,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
 				    || loops-- <= 0) {
 					dev_err(musb->controller,
 					"configured as A device timeout");
-					ret = -EINVAL;
 					break;
 				}
 			}
 
-			if (ret && otg->set_vbus)
+			if (otg->set_vbus)
 				otg_set_vbus(otg, 1);
 		} else {
 			musb->is_active = 1;