diff options
| author | Mathias Nyman <mathias.nyman@linux.intel.com> | 2018-09-04 17:35:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-26 08:39:31 +0200 |
| commit | 3d7a00c4f0aa4abd95c12d7d38652e6e2fc72dfa (patch) | |
| tree | 59234f1fc141dc23f32302daa06b3e2f09038b22 /drivers/usb | |
| parent | 87d948fe3a275815426d3c0b2ada05ada2b5b474 (diff) | |
| download | linux-stable-3d7a00c4f0aa4abd95c12d7d38652e6e2fc72dfa.tar.gz linux-stable-3d7a00c4f0aa4abd95c12d7d38652e6e2fc72dfa.tar.bz2 linux-stable-3d7a00c4f0aa4abd95c12d7d38652e6e2fc72dfa.zip | |
usb: Don't die twice if PCI xhci host is not responding in resume
commit f3dc41c5d22b2ca14a0802a65d8cdc33a3882d4e upstream.
usb_hc_died() should only be called once, and with the primary HCD
as parameter. It will mark both primary and secondary hcd's dead.
Remove the extra call to usb_cd_died with the shared hcd as parameter.
Fixes: ff9d78b36f76 ("USB: Set usb_hcd->state and flags for shared roothubs")
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/hcd-pci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 66fe1b78d952..03432467b05f 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c @@ -515,8 +515,6 @@ static int resume_common(struct device *dev, int event) event == PM_EVENT_RESTORE); if (retval) { dev_err(dev, "PCI post-resume error %d!\n", retval); - if (hcd->shared_hcd) - usb_hc_died(hcd->shared_hcd); usb_hc_died(hcd); } } |