1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 18ed7765417c..7ebf992e8c2f 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -787,8 +787,9 @@ static int pre_init = 1;		/* Before first ordered IDE scan */
 static LIST_HEAD(ide_pci_drivers);
 
 /*
- *      ide_register_pci_driver         -       attach IDE driver
+ *      __ide_pci_register_driver       -       attach IDE driver
  *      @driver: pci driver
+ *      @module: owner module of the driver
  *
  *      Registers a driver with the IDE layer. The IDE layer arranges that
  *      boot time setup is done in the expected device order and then 
@@ -801,15 +802,16 @@ static LIST_HEAD(ide_pci_drivers);
  *      Returns are the same as for pci_register_driver
  */
 
-int ide_pci_register_driver(struct pci_driver *driver)
+int __ide_pci_register_driver(struct pci_driver *driver, struct module *module)
 {
         if(!pre_init)
-                return pci_module_init(driver);
+                return __pci_register_driver(driver, module);
+        driver->driver.owner = module;
         list_add_tail(&driver->node, &ide_pci_drivers);
         return 0;
 }
 
-EXPORT_SYMBOL_GPL(ide_pci_register_driver);
+EXPORT_SYMBOL_GPL(__ide_pci_register_driver);
 
 /**
  *      ide_unregister_pci_driver       -       unregister an IDE driver
@@ -897,6 +899,6 @@ void __init ide_scan_pcibus (int scan_direction)
         {
                 list_del(l);
                 d = list_entry(l, struct pci_driver, node);
-                pci_register_driver(d);
+                __pci_register_driver(d, d->driver.owner);
         }
 }