Re: [PATCH] mfd: max8998 cleanups

[Samuel Ortiz <sameo@linux.intel.com>]

Hi Axel,

On Wed, Oct 20, 2010 at 05:06:44PM +0800, Axel Lin wrote:
> This patch includes below fixes:
> 1. i2c_smbus_write_byte_data() returns zero or negative value,
>    therefore no need to check if ret is greater than zero or not.
> 2. Properly free irq and unregister max8998->rtc device in
>    max8998_i2c_probe() error path and max8998_i2c_remove().
The fixes make sense, I'd appreciate to get 2 separate patches for them
though.

Cheers,
Samuel.


> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
>  drivers/mfd/max8998.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
> index a720f41..bb9977b 100644
> --- a/drivers/mfd/max8998.c
> +++ b/drivers/mfd/max8998.c
> @@ -110,8 +110,6 @@ int max8998_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask)
>  		u8 old_val = ret & 0xff;
>  		u8 new_val = (val & mask) | (old_val & (~mask));
>  		ret = i2c_smbus_write_byte_data(i2c, reg, new_val);
> -		if (ret >= 0)
> -			ret = 0;
>  	}
>  	mutex_unlock(&max8998->iolock);
>  	return ret;
> @@ -155,6 +153,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
>  
>  err:
>  	mfd_remove_devices(max8998->dev);
> +	max8998_irq_exit(max8998);
> +	i2c_unregister_device(max8998->rtc);
>  	kfree(max8998);
>  	return ret;
>  }
> @@ -164,6 +164,8 @@ static int max8998_i2c_remove(struct i2c_client *i2c)
>  	struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
>  
>  	mfd_remove_devices(max8998->dev);
> +	max8998_irq_exit(max8998);
> +	i2c_unregister_device(max8998->rtc);
>  	kfree(max8998);
>  
>  	return 0;
> -- 
> 1.7.2
> 
> 
> 

-- 
Intel Open Source Technology Centre
http://oss.intel.com/