| From cd5a6a4fdaba150089af2afc220eae0fef74878a Mon Sep 17 00:00:00 2001 |
| From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> |
| Date: Tue, 25 Jul 2017 23:58:50 +0200 |
| Subject: USB: hcd: Mark secondary HCD as dead if the primary one died |
| |
| From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| |
| 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> |
| |
| --- |
| drivers/usb/core/hcd.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/usb/core/hcd.c |
| +++ b/drivers/usb/core/hcd.c |
| @@ -2398,6 +2398,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); |
| |
