summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-12-23 18:39:26 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-01-09 00:37:47 +0100
commite3380333b8fdaad07d53953c1831b90d9cc23821 (patch)
treef84d1c99bbdaff0e4f92d1bc260266d68933d5ca /drivers/mfd
parentc3d4d697346e36304a94942ad8ed3e28a0d38a44 (diff)
downloadlinux-e3380333b8fdaad07d53953c1831b90d9cc23821.tar.gz
linux-e3380333b8fdaad07d53953c1831b90d9cc23821.tar.bz2
linux-e3380333b8fdaad07d53953c1831b90d9cc23821.zip
mfd: Introduce missing kfree in 88pm860x probe routine
Error handling code following a kzalloc should free the allocated data. At this point, chip has been allocated and some fields have been initialized, but it has not been stored anywhere, so it should be freed before leaving the function. A simplified version of the semantic match that finds the problem is as follows: (http://coccinelle.lip6.fr) // <smpl> @r exists@ local idexpression x; statement S; identifier f1; position p1,p2; expression *ptr != NULL; @@ x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S <... when != x when != if (...) { <+...x...+> } x->f1 ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/88pm860x-i2c.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/88pm860x-i2c.c b/drivers/mfd/88pm860x-i2c.c
index 630f1b545fc4..f93dd9571c3c 100644
--- a/drivers/mfd/88pm860x-i2c.c
+++ b/drivers/mfd/88pm860x-i2c.c
@@ -286,6 +286,7 @@ static int __devinit pm860x_probe(struct i2c_client *client,
ret = PTR_ERR(chip->regmap);
dev_err(&client->dev, "Failed to allocate register map: %d\n",
ret);
+ kfree(chip);
return ret;
}
chip->client = client;