i2c: powermac: fix return path on error
authorWolfram Sang <wsa@the-dreams.de>
Thu, 11 Jul 2013 21:02:03 +0000 (22:02 +0100)
committerWolfram Sang <wsa@the-dreams.de>
Wed, 21 Aug 2013 09:34:25 +0000 (11:34 +0200)
We want to bail out immediately if i2c_add_adapter failed and not try to
register child nodes with a nilled adapter structure.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-powermac.c

index 5a88364a542b01f5d5a3d67c9a67bb594dd826fd..06858d576552bf354c914f11247038301f505235 100644 (file)
@@ -446,6 +446,7 @@ static int i2c_powermac_probe(struct platform_device *dev)
                printk(KERN_ERR "i2c-powermac: Adapter %s registration "
                       "failed\n", adapter->name);
                memset(adapter, 0, sizeof(*adapter));
+               return rc;
        }
 
        printk(KERN_INFO "PowerMac i2c bus %s registered\n", adapter->name);
@@ -455,7 +456,7 @@ static int i2c_powermac_probe(struct platform_device *dev)
         */
        i2c_powermac_register_devices(adapter, bus);
 
-       return rc;
+       return 0;
 }
 
 static struct platform_driver i2c_powermac_driver = {