Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / usb / otg / twl4030-usb.c

diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index d335f484fcd8dc2e58e8271c7334f08abfbee57f..6ca505f333e4936f8cf486324d2bbffd63693971 100644 (file)
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/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);