diff options
author | david-b@pacbell.net <david-b@pacbell.net> | 2005-06-29 07:00:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-07-12 11:52:56 -0700 |
commit | 1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6 (patch) | |
tree | b135b338484326cb71fca1d3e98878f2141e45f8 | |
parent | e828264ee797d40b1df99fe88c6acfc0f36df639 (diff) | |
download | linux-3.10-1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6.tar.gz linux-3.10-1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6.tar.bz2 linux-3.10-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>
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index c906d675ef4..ff5533e6956 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 */ |