ARM: OMAP: Manually merged drivers/usb/gadget/omap_udc.c

Manually merged drivers/usb/gadget/omap_udc.c

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index a268ce4a616331d184e76c922f0a58aac79008af..a2b812af6e669ab69a384912e18626cbd07190e4 100644 (file)
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2908,7 +2908,6 @@ static int __exit omap_udc_remove(struct device *dev)
  * make host resumes and VBUS detection trigger OMAP wakeup events; that
  * may involve talking to an external transceiver (e.g. isp1301).
  */
-
 static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level)
 {
        u32     devstat;
@@ -2937,6 +2936,8 @@ static int omap_udc_resume(struct device *dev, u32 level)
                return 0;
 
        DBG("resume + wakeup/SRP\n");
+       udc->gadget.dev.parent->power.power_state = PMSG_ON;
+       udc->gadget.dev.power.power_state = PMSG_ON;
        omap_pullup(&udc->gadget, 1);
 
        /* maybe the host would enumerate us if we nudged it */