[PATCH] PCI: fix up pci_register_driver() to stop lying in its return value.

It shouldn't return 1, it needs to return either -ERROR or 0.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 9ac36619562f081ff4e3616aef625d12b5fe5b01..d4847d831d85482cb7b3330ffeabb83d721c8cb5 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -396,13 +396,13 @@ pci_populate_driver_dir(struct pci_driver *drv)
  * @drv: the driver structure to register
  * 
  * Adds the driver structure to the list of registered drivers.
- * Returns a negative value on error. The driver remains registered
- * even if no device was claimed during registration.
+ * Returns a negative value on error, otherwise 0. 
+ * If no error occured, the driver remains registered even if 
+ * no device was claimed during registration.
  */
-int
-pci_register_driver(struct pci_driver *drv)
+int pci_register_driver(struct pci_driver *drv)
 {
-       int count = 0;
+       int error;
 
        /* initialize common driver fields */
        drv->driver.name = drv->name;
@@ -413,13 +413,12 @@ pci_register_driver(struct pci_driver *drv)
        pci_init_dynids(&drv->dynids);
 
        /* register with core */
-       count = driver_register(&drv->driver);
+       error = driver_register(&drv->driver);
 
-       if (count >= 0) {
+       if (!error)
                pci_populate_driver_dir(drv);
-       }
 
-       return count ? count : 1;
+       return error;
 }
 
 /**