summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-08-09 14:48:16 +0800
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-08-11 11:38:02 +0100
commit8f1f151ed8ae4063837221cc9f5386a7af59f4e0 (patch)
treecde2de0cc29c272dfcf489f168dc6c698db006f7 /drivers/mfd
parent1bddc2f5c1727577183761581d5d4d1b00a8bd63 (diff)
downloadlinux-8f1f151ed8ae4063837221cc9f5386a7af59f4e0.tar.gz
linux-8f1f151ed8ae4063837221cc9f5386a7af59f4e0.tar.bz2
linux-8f1f151ed8ae4063837221cc9f5386a7af59f4e0.zip
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 <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/max8998.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 0d68de21ea9e..73e6f5c4efc9 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;