From 4e536ef40cd62e38a14aed764856d3374af5b07b Mon Sep 17 00:00:00 2001 From: "david-b@pacbell.net" Date: Wed, 29 Jun 2005 07:00:56 -0700 Subject: [PATCH] --- yaml --- r: 4622 b: refs/heads/master c: 1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/omap_udc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8a32b5f2e19e..7f40cbfb4e29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e828264ee797d40b1df99fe88c6acfc0f36df639 +refs/heads/master: 1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6 diff --git a/trunk/drivers/usb/gadget/omap_udc.c b/trunk/drivers/usb/gadget/omap_udc.c index c906d675ef4b..ff5533e69560 100644 --- a/trunk/drivers/usb/gadget/omap_udc.c +++ b/trunk/drivers/usb/gadget/omap_udc.c @@ -2908,6 +2908,7 @@ 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; @@ -2936,8 +2937,6 @@ 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 */