diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-25 23:58:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-16 13:43:19 -0700 |
| commit | 199a3f26e9d8c5712833084be362004c959ebb59 (patch) | |
| tree | b9869427b7e4f6ecbf6269b211e92b70dd81c913 | |
| parent | 821ccbe2937ece265dfc087c4fe272242b70350a (diff) | |
| download | linux-stable-199a3f26e9d8c5712833084be362004c959ebb59.tar.gz linux-stable-199a3f26e9d8c5712833084be362004c959ebb59.tar.bz2 linux-stable-199a3f26e9d8c5712833084be362004c959ebb59.zip | |
USB: hcd: Mark secondary HCD as dead if the primary one died
commit cd5a6a4fdaba150089af2afc220eae0fef74878a upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/hcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 8a7c6bbaed7e..2d4fe5ae7e73 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -2474,6 +2474,8 @@ void usb_hc_died (struct usb_hcd *hcd) } if (usb_hcd_is_primary_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) { clear_bit(HCD_FLAG_POLL_RH, &hcd->flags); |