diff options
| author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-02-13 16:25:57 -0800 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-02-14 10:48:05 -0800 |
| commit | 68d07f64b8a11a852d48d1b05b724c3e20c0d94b (patch) | |
| tree | b72ffb8b5cb63f433afb59e7af4da0b92b9a2c86 /drivers/usb/host | |
| parent | b7bc5925a9aafae970c3db1f118c97a7d503114e (diff) | |
| download | linux-3.10-68d07f64b8a11a852d48d1b05b724c3e20c0d94b.tar.gz linux-3.10-68d07f64b8a11a852d48d1b05b724c3e20c0d94b.tar.bz2 linux-3.10-68d07f64b8a11a852d48d1b05b724c3e20c0d94b.zip | |
USB: Don't fail USB3 probe on missing legacy PCI IRQ.
Intel has a PCI USB xhci host controller on a new platform. It doesn't
have a line IRQ definition in BIOS. The Linux driver refuses to
initialize this controller, but Windows works well because it only depends
on MSI.
Actually, Linux also can work for MSI. This patch avoids the line IRQ
checking for USB3 HCDs in usb core PCI probe. It allows the xHCI driver
to try to enable MSI or MSI-X first. It will fail the probe if MSI
enabling failed and there's no legacy PCI IRQ.
This patch should be backported to kernels as old as 2.6.32.
Signed-off-by: Alex Shi <alex.shi@intel.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/usb/host')
| -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 6bbe3c3a711..c939f5fdef9 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); |