From 1375f9e4536bf530ea150ee37c0b5ca8903dff38 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 15 May 2011 09:55:58 -0700
Subject: [PATCH] --- yaml --- r: 248882 b: refs/heads/master c:
 e99c4309fb064604a957d9c1a8d2d4a9ff19cf5e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 01feedf53a50..528c457bd868 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b521fcb6bf63a49bb7712d922dd1dd0a90a93cf
+refs/heads/master: e99c4309fb064604a957d9c1a8d2d4a9ff19cf5e
diff --git a/trunk/drivers/usb/otg/msm_otg.c b/trunk/drivers/usb/otg/msm_otg.c
index db69b2ac9264..b276f8fcdeba 100644
--- a/trunk/drivers/usb/otg/msm_otg.c
+++ b/trunk/drivers/usb/otg/msm_otg.c
@@ -93,11 +93,9 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
 	} else {
 		ret = regulator_set_voltage(hsusb_vddcx, 0,
 			USB_PHY_VDD_DIG_VOL_MAX);
-		if (ret) {
+		if (ret)
 			dev_err(motg->otg.dev, "unable to set the voltage "
 					"for hsusb vddcx\n");
-			return ret;
-		}
 		ret = regulator_disable(hsusb_vddcx);
 		if (ret)
 			dev_err(motg->otg.dev, "unable to disable hsusb vddcx\n");