projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
[cascardo/linux.git]
/
drivers
/
usb
/
core
/
driver.c
diff --git
a/drivers/usb/core/driver.c
b/drivers/usb/core/driver.c
index
ded550e
..
de98a94
100644
(file)
--- a/
drivers/usb/core/driver.c
+++ b/
drivers/usb/core/driver.c
@@
-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.
/* 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);
*/
} else {
status = usb_resume_both(udev, msg);
@@
-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;
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
udev->last_busy = jiffies;
+ do_unbind_rebind(udev, DO_REBIND);
}
}
}
}