Merge branch 'master' into for_paulus

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 92d5e8db0de7..4438ae1ede4f 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -324,8 +324,7 @@ static int pci_default_resume(struct pci_dev *pci_dev)
         /* restore the PCI config space */
         pci_restore_state(pci_dev);
         /* if the device was enabled before suspend, reenable */
-        if (atomic_read(&pci_dev->enable_cnt))
-                retval = __pci_enable_device(pci_dev);
+        retval = __pci_reenable_device(pci_dev);
         /* if the device was busmaster before the suspend, make it busmaster again */
         if (pci_dev->is_busmaster)
                 pci_set_master(pci_dev);
@@ -422,7 +421,8 @@ static struct kobj_type pci_driver_kobj_type = {
  * If no error occurred, the driver remains registered even if 
  * no device was claimed during registration.
  */
-int __pci_register_driver(struct pci_driver *drv, struct module *owner)
+int __pci_register_driver(struct pci_driver *drv, struct module *owner,
+                          const char *mod_name)
 {
         int error;
 
@@ -430,6 +430,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner)
         drv->driver.name = drv->name;
         drv->driver.bus = &pci_bus_type;
         drv->driver.owner = owner;
+        drv->driver.mod_name = mod_name;
         drv->driver.kobj.ktype = &pci_driver_kobj_type;
 
         if (pci_multithread_probe)