diff options
Diffstat (limited to 'drivers/usb/gadget/omap_udc.c')
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index ee1e9a314cd1..56277d24f041 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -1265,8 +1265,6 @@ static int can_pullup(struct omap_udc *udc) | |||
1265 | 1265 | ||
1266 | static void pullup_enable(struct omap_udc *udc) | 1266 | static void pullup_enable(struct omap_udc *udc) |
1267 | { | 1267 | { |
1268 | udc->gadget.dev.parent->power.power_state = PMSG_ON; | ||
1269 | udc->gadget.dev.power.power_state = PMSG_ON; | ||
1270 | UDC_SYSCON1_REG |= UDC_PULLUP_EN; | 1268 | UDC_SYSCON1_REG |= UDC_PULLUP_EN; |
1271 | if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx()) | 1269 | if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx()) |
1272 | OTG_CTRL_REG |= OTG_BSESSVLD; | 1270 | OTG_CTRL_REG |= OTG_BSESSVLD; |
@@ -3061,8 +3059,6 @@ static int omap_udc_suspend(struct platform_device *dev, pm_message_t message) | |||
3061 | omap_pullup(&udc->gadget, 0); | 3059 | omap_pullup(&udc->gadget, 0); |
3062 | } | 3060 | } |
3063 | 3061 | ||
3064 | udc->gadget.dev.power.power_state = PMSG_SUSPEND; | ||
3065 | udc->gadget.dev.parent->power.power_state = PMSG_SUSPEND; | ||
3066 | return 0; | 3062 | return 0; |
3067 | } | 3063 | } |
3068 | 3064 | ||