From e7037403b577529d840eeb063290b8f1b5ba0048 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 16 Aug 2006 17:42:18 +0100 Subject: [PATCH] --- yaml --- r: 36072 b: refs/heads/master c: 50b0075520a0acba9cabab5203bbce918b966d9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci-driver.c | 6 +++++- trunk/include/linux/pci.h | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7071cc88d4ba..2e4edf46e7d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b19441af185559118e8247382ea4f2f76ebffc6d +refs/heads/master: 50b0075520a0acba9cabab5203bbce918b966d9a diff --git a/trunk/drivers/pci/pci-driver.c b/trunk/drivers/pci/pci-driver.c index 309629e03bae..b1c0c707d96c 100644 --- a/trunk/drivers/pci/pci-driver.c +++ b/trunk/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/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index c9bb7bee52c7..549d8410974b 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/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)