# \[PATCH\] i2c: powermac: fix return path on error - Subsystems: I2C SUBSYSTEM, I2C SUBSYSTEM HOST DRIVERS, THE REST - Maintainers: Andi Shyti, Linus Torvalds - List: linuxppc-dev - 2 messages, 2 authors - Page: https://ratatoskr.run/linuxppc-dev/2013/08/9475928/t ## \[PATCH\] i2c: powermac: fix return path on error - From: Wolfram Sang \ - Date: 2013-08-19 13:18:37 - Message: https://ratatoskr.run/linuxppc-dev/2013/08/9475928.md ```text 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 --- 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 ``` ## Re: \[PATCH\] i2c: powermac: fix return path on error - From: Benjamin Herrenschmidt \ - Date: 2013-08-27 07:42:13 - Message: https://ratatoskr.run/linuxppc-dev/2013/08/9476092.md ```text On Mon, 2013-08-19 at 15:18 +0200, Wolfram Sang wrote: > 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 Acked-by: Benjamin Herrenschmidt > --- > 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 = { ```