---

yaml --- r: 248817 b: refs/heads/master c: 2ce2c3a h: refs/heads/master i: 248815: 29f053a v: v3
git-mirror · May 3, 2011 · 89f9a35 · 89f9a35
1 parent 6727a75
commit 89f9a35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;