Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4622
b: refs/heads/master
c: 1d7beee
h: refs/heads/master
v: v3
  • Loading branch information
david-b@pacbell.net authored and Greg Kroah-Hartman committed Jul 12, 2005
1 parent e90071d commit 4e536ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e828264ee797d40b1df99fe88c6acfc0f36df639
refs/heads/master: 1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6
3 changes: 1 addition & 2 deletions trunk/drivers/usb/gadget/omap_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 4e536ef

Please sign in to comment.