2 files changed, 7 insertions, 1 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 309629e03bae..b1c0c707d96c 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -421,7 +421,11 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner)
         drv->driver.bus = &pci_bus_type;
         drv->driver.owner = owner;
         drv->driver.kobj.ktype = &pci_driver_kobj_type;
-        drv->driver.multithread_probe = pci_multithread_probe;
+
+        if (pci_multithread_probe)
+                drv->driver.multithread_probe = pci_multithread_probe;
+        else
+                drv->driver.multithread_probe = drv->multithread_probe;
 
         spin_lock_init(&drv->dynids.lock);
         INIT_LIST_HEAD(&drv->dynids.list);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c9bb7bee52c7..549d8410974b 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -356,6 +356,8 @@ struct pci_driver {
         struct pci_error_handlers *err_handler;
         struct device_driver    driver;
         struct pci_dynids dynids;
+
+        int multithread_probe;
 };
 
 #define to_pci_driver(drv) container_of(drv,struct pci_driver, driver)