xhci: don't dereference a xhci member after removing xhci

matnyman · gregkh · commit f1f6d9a8b540 · 2016-08-16T09:42:47.000+02:00
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: &lt;stable@vger.kernel.org&gt;
Signed-off-by: Mathias Nyman &lt;mathias.nyman@linux.intel.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -314,11 +314,12 @@ static void xhci_pci_remove(struct pci_dev *dev)`
`314`	`314`	`usb_remove_hcd(xhci->shared_hcd);`
`315`	`315`	`usb_put_hcd(xhci->shared_hcd);`
`316`	`316`	`}`
`317`		`- usb_hcd_pci_remove(dev);`
`318`	`317`
`319`	`318`	`/* Workaround for spurious wakeups at shutdown with HSW */`
`320`	`319`	`if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)`
`321`	`320`	`pci_set_power_state(dev, PCI_D3hot);`
	`321`	`+`
	`322`	`+ usb_hcd_pci_remove(dev);`
`322`	`323`	`}`
`323`	`324`
`324`	`325`	`#ifdef CONFIG_PM`