From 660c29b600d63af354418df9d5825f22369073b7 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Tue, 30 Nov 2010 17:58:25 +0200 Subject: [PATCH] --- yaml --- r: 226927 b: refs/heads/master c: c3d6450e741da08c3bc2e2ba06d743c27540abac h: refs/heads/master i: 226925: 2302d07d1657cde3125dadb99090c09e82976c34 226923: feb3f57b134f31f081adc0f7a89df912b0be4fb3 226919: 0bf3c4d0a0a06d3ca3151f508d70a6c9d600cc7c 226911: 1e2e905533d82c0619f25af410c775c5bd4eb9ef v: v3 --- [refs] | 2 +- trunk/drivers/usb/otg/twl4030-usb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c28c7615ad22..6d2a83b0081a 100644 --- 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 index d335f484fcd8..6ca505f333e4 100644 --- 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);