2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index d136b8f4c8a7..81e2c0d9c17d 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));
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index eb19cba34ac9..e1282328fc27 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2447,8 +2447,10 @@ int usb_add_hcd(struct usb_hcd *hcd,
                         && device_can_wakeup(&hcd->self.root_hub->dev))
                 dev_dbg(hcd->self.controller, "supports USB remote wakeup\n");
 
-        /* enable irqs just before we start the controller */
-        if (usb_hcd_is_primary_hcd(hcd)) {
+        /* enable irqs just before we start the controller,
+         * if the BIOS provides legacy PCI irqs.
+         */
+        if (usb_hcd_is_primary_hcd(hcd) && irqnum) {
                 retval = usb_hcd_request_irqs(hcd, irqnum, irqflags);
                 if (retval)
                         goto err_request_irq;