---

yaml --- r: 226927 b: refs/heads/master c: c3d6450 h: refs/heads/master i: 226925: 2302d07 226923: feb3f57 226919: 0bf3c4d 226911: 1e2e905 v: v3
git-mirror · Dec 1, 2010 · 660c29b · 660c29b
1 parent 3ce239e
commit 660c29b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02303f73373aa1da19dbec510ec5a4e2576f9610
+refs/heads/master: c3d6450e741da08c3bc2e2ba06d743c27540abac
diff --git a/trunk/drivers/usb/otg/twl4030-usb.c b/trunk/drivers/usb/otg/twl4030-usb.c
@@ -678,7 +678,8 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev)
 	/* disable complete OTG block */
 	twl4030_usb_clear_bits(twl, POWER_CTRL, POWER_CTRL_OTG_ENAB);
 
-	twl4030_phy_power(twl, 0);
+	if (!twl->asleep)
+		twl4030_phy_power(twl, 0);
 	regulator_put(twl->usb1v5);
 	regulator_put(twl->usb1v8);
 	regulator_put(twl->usb3v1);