Merge ../linux-2.6

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 7e2e8cd1c14a..934bd55bae15 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -241,9 +241,14 @@ static struct parport_driver i2c_parport_driver = {
 
 static int __init i2c_parport_init(void)
 {
-        if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) {
+        if (type < 0) {
+                printk(KERN_WARNING "i2c-parport: adapter type unspecified\n");
+                return -ENODEV;
+        }
+
+        if (type >= ARRAY_SIZE(adapter_parm)) {
                 printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
-                type = 0;
+                return -ENODEV;
         }
 
         return parport_register_driver(&i2c_parport_driver);