Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
index e847f0d6c7fe..f3852a6b74ea 100644
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -84,7 +84,7 @@ static int __init validate_parameters(void)
 
         if(!bridge) {
                 info("not configured, disabling.");
-                return 1;
+                return -EINVAL;
         }
         str = bridge;
         if(!*str)
@@ -147,7 +147,7 @@ static int __init cpcihp_generic_init(void)
 
         info(DRIVER_DESC " version: " DRIVER_VERSION);
         status = validate_parameters();
-        if(status != 0)
+        if (status)
                 return status;
 
         r = request_region(port, 1, "#ENUM hotswap signal register");