public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mfd: WM8350: remove incorrect kfree
@ 2010-04-21 15:36 Rabin Vincent
  2010-04-21 17:42 ` Mark Brown
  2010-05-09 21:10 ` Samuel Ortiz
  0 siblings, 2 replies; 3+ messages in thread
From: Rabin Vincent @ 2010-04-21 15:36 UTC (permalink / raw)
  To: sameo; +Cc: broonie, linux-kernel, Rabin Vincent

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

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
 drivers/mfd/wm8350-i2c.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
index 65830f5..5fe5de1 100644
--- a/drivers/mfd/wm8350-i2c.c
+++ b/drivers/mfd/wm8350-i2c.c
@@ -64,10 +64,8 @@ static int wm8350_i2c_probe(struct i2c_client *i2c,
 	int ret = 0;
 
 	wm8350 = kzalloc(sizeof(struct wm8350), GFP_KERNEL);
-	if (wm8350 == NULL) {
-		kfree(i2c);
+	if (wm8350 == NULL)
 		return -ENOMEM;
-	}
 
 	i2c_set_clientdata(i2c, wm8350);
 	wm8350->dev = &i2c->dev;
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] mfd: WM8350: remove incorrect kfree
  2010-04-21 15:36 [PATCH] mfd: WM8350: remove incorrect kfree Rabin Vincent
@ 2010-04-21 17:42 ` Mark Brown
  2010-05-09 21:10 ` Samuel Ortiz
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2010-04-21 17:42 UTC (permalink / raw)
  To: Rabin Vincent; +Cc: sameo, linux-kernel

On Wed, Apr 21, 2010 at 09:06:05PM +0530, Rabin Vincent wrote:
> The i2c_client received in probe() should not be kfree()'d.
> 
> Signed-off-by: Rabin Vincent <rabin@rab.in>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mfd: WM8350: remove incorrect kfree
  2010-04-21 15:36 [PATCH] mfd: WM8350: remove incorrect kfree Rabin Vincent
  2010-04-21 17:42 ` Mark Brown
@ 2010-05-09 21:10 ` Samuel Ortiz
  1 sibling, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2010-05-09 21:10 UTC (permalink / raw)
  To: Rabin Vincent; +Cc: broonie, linux-kernel

Hi Vincent,

On Wed, Apr 21, 2010 at 09:06:05PM +0530, Rabin Vincent wrote:
> The i2c_client received in probe() should not be kfree()'d.
Patch applied, many thanks.

Cheers,
Samuel.


> Signed-off-by: Rabin Vincent <rabin@rab.in>
> ---
>  drivers/mfd/wm8350-i2c.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
> index 65830f5..5fe5de1 100644
> --- a/drivers/mfd/wm8350-i2c.c
> +++ b/drivers/mfd/wm8350-i2c.c
> @@ -64,10 +64,8 @@ static int wm8350_i2c_probe(struct i2c_client *i2c,
>  	int ret = 0;
>  
>  	wm8350 = kzalloc(sizeof(struct wm8350), GFP_KERNEL);
> -	if (wm8350 == NULL) {
> -		kfree(i2c);
> +	if (wm8350 == NULL)
>  		return -ENOMEM;
> -	}
>  
>  	i2c_set_clientdata(i2c, wm8350);
>  	wm8350->dev = &i2c->dev;
> -- 
> 1.7.0.4
> 

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-05-09 21:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-21 15:36 [PATCH] mfd: WM8350: remove incorrect kfree Rabin Vincent
2010-04-21 17:42 ` Mark Brown
2010-05-09 21:10 ` Samuel Ortiz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox