1 files changed, 22 insertions, 3 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index d911e0c1f359..4393c12e9135 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -216,6 +216,13 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
         return NULL;
 }
 
+static const struct pci_device_id pci_device_id_any = {
+        .vendor = PCI_ANY_ID,
+        .device = PCI_ANY_ID,
+        .subvendor = PCI_ANY_ID,
+        .subdevice = PCI_ANY_ID,
+};
+
 /**
  * pci_match_device - Tell if a PCI device structure has a matching PCI device id structure
  * @drv: the PCI driver to match against
@@ -229,18 +236,30 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv,
                                                     struct pci_dev *dev)
 {
         struct pci_dynid *dynid;
+        const struct pci_device_id *found_id = NULL;
+
+        /* When driver_override is set, only bind to the matching driver */
+        if (dev->driver_override && strcmp(dev->driver_override, drv->name))
+                return NULL;
 
         /* Look at the dynamic ids first, before the static ones */
         spin_lock(&drv->dynids.lock);
         list_for_each_entry(dynid, &drv->dynids.list, node) {
                 if (pci_match_one_device(&dynid->id, dev)) {
-                        spin_unlock(&drv->dynids.lock);
-                        return &dynid->id;
+                        found_id = &dynid->id;
+                        break;
                 }
         }
         spin_unlock(&drv->dynids.lock);
 
-        return pci_match_id(drv->id_table, dev);
+        if (!found_id)
+                found_id = pci_match_id(drv->id_table, dev);
+
+        /* driver_override will always match, send a dummy id */
+        if (!found_id && dev->driver_override)
+                found_id = &pci_device_id_any;
+
+        return found_id;
 }
 
 struct drv_dev_and_id {