diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-14 14:48:15 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-14 14:48:15 -0800 |
| commit | 887aa58e482dbf6d35d24cfa7b3315c8f5543339 (patch) | |
| tree | b72ffb8b5cb63f433afb59e7af4da0b92b9a2c86 /drivers/usb/host/xhci.c | |
| parent | b7bc5925a9aafae970c3db1f118c97a7d503114e (diff) | |
| parent | 68d07f64b8a11a852d48d1b05b724c3e20c0d94b (diff) | |
Merge tag 'for-usb-linus-2012-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
xHCI bug fix for broken BIOS on some Intel systems.
Happy Valentine's Day! Your present is a working xHCI driver under some
Intel systems with buggy BIOSes that don't provide a legacy PCI IRQ line
for the USB 3.0 host.
Please queue for 3.3 and stable to share the love!
Diffstat (limited to 'drivers/usb/host/xhci.c')
| -rw-r--r-- | drivers/usb/host/xhci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 6bbe3c3a7111..c939f5fdef9e 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -352,6 +352,11 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd) /* hcd->irq is -1, we have MSI */ return 0; + if (!pdev->irq) { + xhci_err(xhci, "No msi-x/msi found and no IRQ in BIOS\n"); + return -EINVAL; + } + /* fall back to legacy interrupt*/ ret = request_irq(pdev->irq, &usb_hcd_irq, IRQF_SHARED, hcd->irq_descr, hcd); |