From: Jack Pham Date: Fri, 15 Nov 2013 22:53:14 +0000 (-0800) Subject: usb: xhci: Check for XHCI_PLAT in xhci_cleanup_msix() X-Git-Tag: next-20140106~16^2~55^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9005355af23856c55a5538c9024355785424821b;p=karo-tx-linux.git usb: xhci: Check for XHCI_PLAT in xhci_cleanup_msix() If CONFIG_PCI is enabled, make sure xhci_cleanup_msix() doesn't try to free a bogus PCI IRQ or dereference an invalid pci_dev when the xHCI device is actually a platform_device. This patch should be backported to kernels as old as 3.9, that contain the commit 52fb61250a7a132b0cfb9f4a1060a1f3c49e5a25 "xhci-plat: Don't enable legacy PCI interrupts." Signed-off-by: Jack Pham Signed-off-by: Sarah Sharp Cc: stable@vger.kernel.org --- diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 6bc966cfb60e..f8ffc512faf1 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -325,6 +325,9 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci) struct usb_hcd *hcd = xhci_to_hcd(xhci); struct pci_dev *pdev = to_pci_dev(hcd->self.controller); + if (xhci->quirks & XHCI_PLAT) + return; + xhci_free_irq(xhci); if (xhci->msix_entries) {