summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authordavid-b@pacbell.net <david-b@pacbell.net>2005-06-29 07:00:56 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-07-12 11:52:56 -0700
commit1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6 (patch)
treeb135b338484326cb71fca1d3e98878f2141e45f8 /drivers/usb/gadget
parente828264ee797d40b1df99fe88c6acfc0f36df639 (diff)
downloadblackbird-op-linux-1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6.tar.gz
blackbird-op-linux-1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6.zip
[PATCH] USB: omap_udc tweaks
Minor OMAP updates that somehow got dropped from previous patches. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/omap_udc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index c906d675ef4b..ff5533e69560 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/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 */
OpenPOWER on IntegriCloud