From 89f9a35be5e16f1a5fba6be04b352a7446644097 Mon Sep 17 00:00:00 2001
From: Pavankumar Kondeti <pkondeti@codeaurora.org>
Date: Mon, 2 May 2011 11:56:33 +0530
Subject: [PATCH] --- yaml --- r: 248817 b: refs/heads/master c:
 2ce2c3ac8852cfc8f74f4b7b9a2c4cdff007f96a h: refs/heads/master i:   248815:
 29f053a5cfc37ea7f6dec561a8db34c12f0dad05 v: v3

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

diff --git a/[refs] b/[refs]
index 8ce2ebec60cd..218d6c0c58c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac1aa6a21747d02a93b1becb4ab19f1fc9de2beb
+refs/heads/master: 2ce2c3ac8852cfc8f74f4b7b9a2c4cdff007f96a
diff --git a/trunk/drivers/usb/otg/msm_otg.c b/trunk/drivers/usb/otg/msm_otg.c
index 296598628b85..f58b7dab75aa 100644
--- a/trunk/drivers/usb/otg/msm_otg.c
+++ b/trunk/drivers/usb/otg/msm_otg.c
@@ -389,14 +389,14 @@ static int msm_otg_resume(struct msm_otg *motg)
 	if (bus)
 		set_bit(HCD_FLAG_HW_ACCESSIBLE, &(bus_to_hcd(bus))->flags);
 
+	atomic_set(&motg->in_lpm, 0);
+
 	if (motg->async_int) {
 		motg->async_int = 0;
 		pm_runtime_put(otg->dev);
 		enable_irq(motg->irq);
 	}
 
-	atomic_set(&motg->in_lpm, 0);
-
 	dev_info(otg->dev, "USB exited from low power mode\n");
 
 	return 0;