diff options
author | Axel Lin <axel.lin@gmail.com> | 2010-08-06 01:33:15 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-11 06:38:02 -0400 |
commit | 7c4c25e4bc37672e68d1c480a81fcb0efe6d2006 (patch) | |
tree | 210ce0ab1d7f6753d05bb4d36b2a8270ad6c95ad /drivers | |
parent | c4604e49c1a5832a58789a22eba7ca982933e1be (diff) |
regulator: max1586 - fix a memory leak in max1586_pmic_remove()
In max1586_pmic_probe(), we allocate memory for max1586.
In max1586_pmic_remove(), current implementation only free rdev
which is a member of struct max1586_data.
Thus, there is a small memory leak when we unload the module.
This patch fixes the memory leak by passing max1586 to i2c clientdata,
and properly kfree(max1586) in max1586_pmic_remove().
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/regulator/max1586.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index 2b54d9d75f11..8867c2710a6d 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c | |||
@@ -223,7 +223,7 @@ static int __devinit max1586_pmic_probe(struct i2c_client *client, | |||
223 | } | 223 | } |
224 | } | 224 | } |
225 | 225 | ||
226 | i2c_set_clientdata(client, rdev); | 226 | i2c_set_clientdata(client, max1586); |
227 | dev_info(&client->dev, "Maxim 1586 regulator driver loaded\n"); | 227 | dev_info(&client->dev, "Maxim 1586 regulator driver loaded\n"); |
228 | return 0; | 228 | return 0; |
229 | 229 | ||
@@ -238,13 +238,13 @@ out: | |||
238 | 238 | ||
239 | static int __devexit max1586_pmic_remove(struct i2c_client *client) | 239 | static int __devexit max1586_pmic_remove(struct i2c_client *client) |
240 | { | 240 | { |
241 | struct regulator_dev **rdev = i2c_get_clientdata(client); | 241 | struct max1586_data *max1586 = i2c_get_clientdata(client); |
242 | int i; | 242 | int i; |
243 | 243 | ||
244 | for (i = 0; i <= MAX1586_V6; i++) | 244 | for (i = 0; i <= MAX1586_V6; i++) |
245 | if (rdev[i]) | 245 | if (max1586->rdev[i]) |
246 | regulator_unregister(rdev[i]); | 246 | regulator_unregister(max1586->rdev[i]); |
247 | kfree(rdev); | 247 | kfree(max1586); |
248 | 248 | ||
249 | return 0; | 249 | return 0; |
250 | } | 250 | } |