From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2005 13:50:13 +0000 (-0700)
Subject: ARM: OMAP: Manually merged drivers/usb/gadget/omap_udc.c
X-Git-Tag: v2.6.13-omap1~99
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0c803ebb2f51defa30566fef64f15d5da91c80e2;p=linux-2.6-omap-h63xx.git

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 a268ce4a616..a2b812af6e6 100644
--- 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 */