diff options
author | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
commit | 5ee07f2a498e0a5f4a9994317c0f2e451e27b4f2 (patch) | |
tree | 8d8cc50a7de738e1e6b7a66ec27120f616b3919a /drivers/usb/core/hcd-pci.c | |
parent | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (diff) | |
parent | 44fb3170ae46f8de964a4bb5b0504e865a6dd7da (diff) |
Merge commit 'v3.2.9' into rt-3.2.9-rt13v3.2.9-rt13
Diffstat (limited to 'drivers/usb/core/hcd-pci.c')
-rw-r--r-- | drivers/usb/core/hcd-pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index a004db35f6d0..61d08ddcf888 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c @@ -187,7 +187,10 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) return -ENODEV; dev->current_state = PCI_D0; - if (!dev->irq) { + /* The xHCI driver supports MSI and MSI-X, + * so don't fail if the BIOS doesn't provide a legacy IRQ. + */ + if (!dev->irq && (driver->flags & HCD_MASK) != HCD_USB3) { dev_err(&dev->dev, "Found HC with no IRQ. Check BIOS/PCI %s setup!\n", pci_name(dev)); |