diff options
author | david-b@pacbell.net <david-b@pacbell.net> | 2005-06-29 10:00:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-07-12 14:52:56 -0400 |
commit | 1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6 (patch) | |
tree | b135b338484326cb71fca1d3e98878f2141e45f8 /drivers/usb/gadget/omap_udc.c | |
parent | e828264ee797d40b1df99fe88c6acfc0f36df639 (diff) |
[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/omap_udc.c')
-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 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) | |||
2908 | * make host resumes and VBUS detection trigger OMAP wakeup events; that | 2908 | * make host resumes and VBUS detection trigger OMAP wakeup events; that |
2909 | * may involve talking to an external transceiver (e.g. isp1301). | 2909 | * may involve talking to an external transceiver (e.g. isp1301). |
2910 | */ | 2910 | */ |
2911 | |||
2911 | static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level) | 2912 | static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level) |
2912 | { | 2913 | { |
2913 | u32 devstat; | 2914 | u32 devstat; |
@@ -2936,8 +2937,6 @@ static int omap_udc_resume(struct device *dev, u32 level) | |||
2936 | return 0; | 2937 | return 0; |
2937 | 2938 | ||
2938 | DBG("resume + wakeup/SRP\n"); | 2939 | DBG("resume + wakeup/SRP\n"); |
2939 | udc->gadget.dev.parent->power.power_state = PMSG_ON; | ||
2940 | udc->gadget.dev.power.power_state = PMSG_ON; | ||
2941 | omap_pullup(&udc->gadget, 1); | 2940 | omap_pullup(&udc->gadget, 1); |
2942 | 2941 | ||
2943 | /* maybe the host would enumerate us if we nudged it */ | 2942 | /* maybe the host would enumerate us if we nudged it */ |