Commit cd5a6a4f authored Jul 25, 2017 by Rafael J. Wysocki Committed by Greg Kroah-Hartman Jul 30, 2017

USB: hcd: Mark secondary HCD as dead if the primary one died



Make usb_hc_died() clear the HCD_FLAG_RH_RUNNING flag for the shared
HCD and set HCD_FLAG_DEAD for it, in analogy with what is done for
the primary one.

Among other thigs, this prevents check_root_hub_suspended() from
returning -EBUSY for dead HCDs which helps to work around system
suspend issues in some situations.

This actually fixes occasional suspend failures on one of my test
machines.

Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 520eccdf

drivers/usb/core/hcd.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2485,6 +2485,8 @@ void usb_hc_died (struct usb_hcd *hcd)
	}		}
	if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) {		if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) {
	hcd = hcd->shared_hcd;		hcd = hcd->shared_hcd;
			clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
			set_bit(HCD_FLAG_DEAD, &hcd->flags);
	if (hcd->rh_registered) {		if (hcd->rh_registered) {
	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);		clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);