diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 00:34:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 00:34:17 +0200 |
| commit | 655db7980596f0ad4f15f8f4c51beb3e705762de (patch) | |
| tree | 246124b86e0444a22cc5811ff45720eca6895484 /drivers/usb/host/xhci-pci.c | |
| parent | USB: uas: add locking (diff) | |
| parent | xhci: Intel Panther Point BEI quirk. (diff) | |
| download | linux-655db7980596f0ad4f15f8f4c51beb3e705762de.tar.xz linux-655db7980596f0ad4f15f8f4c51beb3e705762de.zip | |
Merge tag 'for-usb-next-2012-09-25' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next
xHCI bug fixes for 3.7
Hi Greg,
Here's three small bug fixes for 3.7. They fix a NULL pointer deference
and lost USB device unplug events, as well as making sure the xHCI
driver doesn't prevent system suspend.
Sarah Sharp
Diffstat (limited to 'drivers/usb/host/xhci-pci.c')
| -rw-r--r-- | drivers/usb/host/xhci-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 9bfd4ca1153c..8345d7c23061 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -103,6 +103,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) * PPT chipsets. */ xhci->quirks |= XHCI_SPURIOUS_REBOOT; + xhci->quirks |= XHCI_AVOID_BEI; } if (pdev->vendor == PCI_VENDOR_ID_ETRON && pdev->device == PCI_DEVICE_ID_ASROCK_P67) { |