Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199840
b: refs/heads/master
c: c043f12
h: refs/heads/master
v: v3
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Jun 4, 2010
1 parent bbe6799 commit 5574a26
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 109f34e71b9049a57f6cdf3f1da6bee2b722b259
refs/heads/master: c043f1245654a726925529007210e9f786426448
2 changes: 2 additions & 0 deletions trunk/drivers/usb/core/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,7 @@ int usb_resume(struct device *dev, pm_message_t msg)

/* For all other calls, take the device back to full power and
* tell the PM core in case it was autosuspended previously.
* Unbind the interfaces that will need rebinding later.
*/
} else {
status = usb_resume_both(udev, msg);
Expand All @@ -1336,6 +1337,7 @@ int usb_resume(struct device *dev, pm_message_t msg)
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
udev->last_busy = jiffies;
do_unbind_rebind(udev, DO_REBIND);
}
}

Expand Down

0 comments on commit 5574a26

Please sign in to comment.