Commit 6c640945 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

USB: don't rebind drivers after failed resume or reset

This patch (as1152) may help prevent some problems associated with the
new policy of unbinding drivers that don't support suspend/resume or
pre_reset/post_reset.  If for any reason the resume or reset fails, and
the device is logically disconnected, there's no point in trying to
rebind the driver.  So the patch checks for success before carrying
out the unbind/rebind.

There was a report from one user that this fixed a problem he was
experiencing, but the details never became fully clear.  In any case,
adding these tests can't hurt.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a496c64f
...@@ -1610,7 +1610,8 @@ int usb_external_resume_device(struct usb_device *udev) ...@@ -1610,7 +1610,8 @@ int usb_external_resume_device(struct usb_device *udev)
status = usb_resume_both(udev); status = usb_resume_both(udev);
udev->last_busy = jiffies; udev->last_busy = jiffies;
usb_pm_unlock(udev); usb_pm_unlock(udev);
do_unbind_rebind(udev, DO_REBIND); if (status == 0)
do_unbind_rebind(udev, DO_REBIND);
/* Now that the device is awake, we can start trying to autosuspend /* Now that the device is awake, we can start trying to autosuspend
* it again. */ * it again. */
......
...@@ -3504,7 +3504,7 @@ int usb_reset_device(struct usb_device *udev) ...@@ -3504,7 +3504,7 @@ int usb_reset_device(struct usb_device *udev)
USB_INTERFACE_BOUND) USB_INTERFACE_BOUND)
rebind = 1; rebind = 1;
} }
if (rebind) if (ret == 0 && rebind)
usb_rebind_intf(cintf); usb_rebind_intf(cintf);
} }
} }
......
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