diff options
author | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:55 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:55 +0000 |
commit | 4ed15484d2b90c28ecb0eb4ed0330049343c60ad (patch) | |
tree | a95b5adbc989002647a42b0f392f311015a0fa02 /drivers/usb/host/xhci.c | |
parent | 0f3550b731084e2790caf1d73bfe0e3a454aafae (diff) | |
parent | 4b9c8ddadce3ec70fa5d93875adeda861b21c84e (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/usb/host/xhci.c')
-rw-r--r-- | drivers/usb/host/xhci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 4a5251f3614..a90819b8322 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -315,6 +315,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) { |