2010-08-09 06:46:34

by Axel Lin

Subject: [PATCH 1/4] mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler

The i2c_client received in probe() should not be kfree()'d.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/mfd/max8998.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 0d68de2..73e6f5c 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -89,10 +89,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
int ret = 0;

max8998 = kzalloc(sizeof(struct max8998_dev), GFP_KERNEL);
- if (max8998 == NULL) {
- kfree(i2c);
+ if (max8998 == NULL)
return -ENOMEM;
- }

i2c_set_clientdata(i2c, max8998);
max8998->dev = &i2c->dev;
--
1.5.4.3

2010-08-09 09:15:28

by Samuel Ortiz

Subject: Re: [PATCH 1/4] mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler

Hi Axel,

On Mon, Aug 09, 2010 at 02:48:16PM +0800, Axel Lin wrote:
> The i2c_client received in probe() should not be kfree()'d.
This should go through Liam's tree, I'm CC'ing him to this thread.

Cheers,
Samuel.


> Signed-off-by: Axel Lin <[email protected]>
> ---
> drivers/mfd/max8998.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
> index 0d68de2..73e6f5c 100644
> --- a/drivers/mfd/max8998.c
> +++ b/drivers/mfd/max8998.c
> @@ -89,10 +89,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
> int ret = 0;
>
> max8998 = kzalloc(sizeof(struct max8998_dev), GFP_KERNEL);
> - if (max8998 == NULL) {
> - kfree(i2c);
> + if (max8998 == NULL)
> return -ENOMEM;
> - }
>
> i2c_set_clientdata(i2c, max8998);
> max8998->dev = &i2c->dev;
> --
> 1.5.4.3
>
>
>

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

2010-08-09 09:36:25

by Liam Girdwood

Subject: Re: [PATCH 1/4] mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler

On Mon, 2010-08-09 at 11:15 +0200, Samuel Ortiz wrote:
> Hi Axel,
>
> On Mon, Aug 09, 2010 at 02:48:16PM +0800, Axel Lin wrote:
> > The i2c_client received in probe() should not be kfree()'d.
> This should go through Liam's tree, I'm CC'ing him to this thread.

Thanks, I assume I have you Ack too ?

Thanks

Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

2010-08-09 09:44:27

by Samuel Ortiz

Subject: Re: [PATCH 1/4] mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler

On Mon, Aug 09, 2010 at 10:36:12AM +0100, Liam Girdwood wrote:
> On Mon, 2010-08-09 at 11:15 +0200, Samuel Ortiz wrote:
> > Hi Axel,
> >
> > On Mon, Aug 09, 2010 at 02:48:16PM +0800, Axel Lin wrote:
> > > The i2c_client received in probe() should not be kfree()'d.
> > This should go through Liam's tree, I'm CC'ing him to this thread.
>
> Thanks, I assume I have you Ack too ?
Yup, sorry about that:
Signed-off-by: Samuel Ortiz <[email protected]>

Cheers,
Samuel.


> Thanks
>
> Liam
> --
> Freelance Developer, SlimLogic Ltd
> ASoC and Voltage Regulator Maintainer.
> http://www.slimlogic.co.uk
>

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

2010-08-09 10:05:10

by Liam Girdwood

Subject: Re: [PATCH 1/4] mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler

On Mon, 2010-08-09 at 11:44 +0200, Samuel Ortiz wrote:
> On Mon, Aug 09, 2010 at 10:36:12AM +0100, Liam Girdwood wrote:
> > On Mon, 2010-08-09 at 11:15 +0200, Samuel Ortiz wrote:
> > > Hi Axel,
> > >
> > > On Mon, Aug 09, 2010 at 02:48:16PM +0800, Axel Lin wrote:
> > > > The i2c_client received in probe() should not be kfree()'d.
> > > This should go through Liam's tree, I'm CC'ing him to this thread.
> >
> > Thanks, I assume I have you Ack too ?
> Yup, sorry about that:
> Signed-off-by: Samuel Ortiz <[email protected]>
>

Applied.

Thanks

Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk