summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Nyman <mathias.nyman@linux.intel.com>2016-08-16 10:18:06 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-16 09:42:47 +0200
commitf1f6d9a8b540df22b87a5bf6bc104edaade81f47 (patch)
tree5b0bb03840f9f27eadfb3a5dea7e187aa2e4fdcb
parent88716a93766b8f095cdef37a8e8f2c93aa233b21 (diff)
downloadop-kernel-dev-f1f6d9a8b540df22b87a5bf6bc104edaade81f47.zip
op-kernel-dev-f1f6d9a8b540df22b87a5bf6bc104edaade81f47.tar.gz
xhci: don't dereference a xhci member after removing xhci
Remove the hcd after checking for the xhci last quirks, not before. This caused a hang on a Alpine Ridge xhci based maching which remove the whole xhci controller when unplugging the last usb device CC: <stable@vger.kernel.org> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/xhci-pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 4fd041b..d7b0f97 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -314,11 +314,12 @@ static void xhci_pci_remove(struct pci_dev *dev)
usb_remove_hcd(xhci->shared_hcd);
usb_put_hcd(xhci->shared_hcd);
}
- usb_hcd_pci_remove(dev);
/* Workaround for spurious wakeups at shutdown with HSW */
if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
pci_set_power_state(dev, PCI_D3hot);
+
+ usb_hcd_pci_remove(dev);
}
#ifdef CONFIG_PM
OpenPOWER on IntegriCloud