diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 03:50:11 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 03:50:11 +0400 |
| commit | f851013cb2238a82782da03ac82a14447933f90d (patch) | |
| tree | f97835f69d244865c4a5397d0e6d45d1276a919d /drivers/usb/host/xhci.c | |
| parent | f2699491e06584a2ebb0939f108ad29f3b151456 (diff) | |
| parent | 203738e548cefc3fc3c2f73a9063176c9f3583d5 (diff) | |
| download | linux-f851013cb2238a82782da03ac82a14447933f90d.tar.xz | |
Merge remote-tracking branch 'origin/master' into next
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); |