From d5fc2b5302632492e9dbed25af3dda5982537f19 Mon Sep 17 00:00:00 2001
From: "Aguilar Pena, Leed" <leed.aguilar@ti.com>
Date: Fri, 20 Nov 2009 11:32:53 -0600
Subject: [PATCH] --- yaml --- r: 174977 b: refs/heads/master c:
 be30fc4b650acb85549fd0a9c42fe042366de009 h: refs/heads/master i:   174975:
 0421c6b8b9ed0b599107f3c36c70e9682e28fed0 v: v3

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

diff --git a/[refs] b/[refs]
index 4eb6a520ee12..f63b183ae1dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec412b92dbe3ea839716853eea058d1bcc5e6ca4
+refs/heads/master: be30fc4b650acb85549fd0a9c42fe042366de009
diff --git a/trunk/drivers/usb/otg/twl4030-usb.c b/trunk/drivers/usb/otg/twl4030-usb.c
index 9e3e7a5c258b..bd9883f41e63 100644
--- a/trunk/drivers/usb/otg/twl4030-usb.c
+++ b/trunk/drivers/usb/otg/twl4030-usb.c
@@ -598,12 +598,12 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
 		 * USB_LINK_VBUS state.  musb_hdrc won't care until it
 		 * starts to handle softconnect right.
 		 */
-		twl4030charger_usb_en(status == USB_LINK_VBUS);
-
 		if (status == USB_LINK_NONE)
 			twl4030_phy_suspend(twl, 0);
 		else
 			twl4030_phy_resume(twl);
+
+		twl4030charger_usb_en(status == USB_LINK_VBUS);
 	}
 	sysfs_notify(&twl->dev->kobj, NULL, "vbus");