Skip to contentSkip to conversation

mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler

PATCH Applied Axel Lin 3 participants 5 messages Aug 9, 2010 Multifunction devices (MFD)

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

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.

---
 drivers/mfd/max8998.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/mfd/max8998.c +1 -3
index 0d68de2..73e6f5c 100644
@@ -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;
Signature · 1 line
1.5.4.3
#1 lore raw

Hi Axel,

Quoted 1 line · Axel Lin

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.

Quoted 26 lines
---
 drivers/mfd/max8998.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/mfd/max8998.c +1 -3
index 0d68de2..73e6f5c 100644
@@ -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;
Signature · 1 line
1.5.4.3
Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#2 lore raw
Quoted 5 lines · Samuel Ortiz

Hi Axel,

Quoted 1 line · Axel Lin

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

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
#3 lore raw
Quoted 8 lines · Liam Girdwood
Quoted 5 lines · Samuel Ortiz

Hi Axel,

Quoted 1 line · Axel Lin

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:

Cheers,
Samuel.

Quoted 8 lines

Thanks

Liam

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#4 lore raw
Quoted 4 lines · Samuel Ortiz
Quoted 3 lines · Liam Girdwood
Quoted 2 lines · Samuel Ortiz

Hi Axel,

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines · Axel Lin
Quoted 1 line

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:

Applied.

Thanks

Liam

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk