diff --git a/[refs] b/[refs] index 1f730694090a..c22e85fc17af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 109f34e71b9049a57f6cdf3f1da6bee2b722b259 +refs/heads/master: c043f1245654a726925529007210e9f786426448 diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c index ded550eda5d9..de98a94d1853 100644 --- a/trunk/drivers/usb/core/driver.c +++ b/trunk/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. + * Unbind the interfaces that will need rebinding later. */ } 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; + do_unbind_rebind(udev, DO_REBIND); } }