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 <w...@the-dreams.de>
---
 drivers/i2c/busses/i2c-powermac.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-powermac.c 
b/drivers/i2c/busses/i2c-powermac.c
index 8dc90da..bb81773 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -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 = {
-- 
1.7.10.4

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to