[PATCH] i2c: powermac: fix return path on error

Benjamin Herrenschmidt benh at kernel.crashing.org
Tue Aug 27 17:42:05 EST 2013


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 <wsa at the-dreams.de>

Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
> ---
>  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 = {




More information about the Linuxppc-dev mailing list