Skip to content

L
linux-davinci
Commit 0c803ebb authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

ARM: OMAP: Manually merged drivers/usb/gadget/omap_udc.c 

Manually merged drivers/usb/gadget/omap_udc.c
parent 702da6b4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
drivers/usb/gadget/omap_udc.c
View file @ 0c803ebb
...@@ -2908,7 +2908,6 @@ static int __exit omap_udc_remove(struct device *dev) ...@@ -2908,7 +2908,6 @@ static int __exit omap_udc_remove(struct device *dev)
* make host resumes and VBUS detection trigger OMAP wakeup events; that * make host resumes and VBUS detection trigger OMAP wakeup events; that
* may involve talking to an external transceiver (e.g. isp1301). * may involve talking to an external transceiver (e.g. isp1301).
*/ */
static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level) static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level)
{ {
u32 devstat; u32 devstat;
...@@ -2937,6 +2936,8 @@ static int omap_udc_resume(struct device *dev, u32 level) ...@@ -2937,6 +2936,8 @@ static int omap_udc_resume(struct device *dev, u32 level)
return 0; return 0;
DBG("resume + wakeup/SRP\n"); 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); omap_pullup(&udc->gadget, 1);
/* maybe the host would enumerate us if we nudged it */ /* maybe the host would enumerate us if we nudged it */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment