diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-08-06 13:35:27 +0800 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-11 11:38:02 +0100 |
| commit | 53a4befa4e3d1490a63dae1ac03a2e7c865b2f53 (patch) | |
| tree | 837c092393deaed4ae3f86e70bb9b552fe004272 /drivers/regulator/max8660.c | |
| parent | 7c4c25e4bc37672e68d1c480a81fcb0efe6d2006 (diff) | |
| download | op-kernel-dev-53a4befa4e3d1490a63dae1ac03a2e7c865b2f53.zip op-kernel-dev-53a4befa4e3d1490a63dae1ac03a2e7c865b2f53.tar.gz | |
regulator: max8660 - fix a memory leak in max8660_remove()
In max8660_probe(), we allocate memory for max660.
In max8660_remove(), current implementation only free rdev
which is a member of struct max8660.
Thus, there is a small memory leak when we unload the module.
This patch fixes the memory leak by passing max660 to i2c clientdata,
and properly kfree(max8660) in max8660_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>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator/max8660.c')
| -rw-r--r-- | drivers/regulator/max8660.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index d97220e..c570e6e 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c @@ -450,7 +450,7 @@ static int __devinit max8660_probe(struct i2c_client *client, } } - i2c_set_clientdata(client, rdev); + i2c_set_clientdata(client, max8660); dev_info(&client->dev, "Maxim 8660/8661 regulator driver loaded\n"); return 0; @@ -465,13 +465,13 @@ out: static int __devexit max8660_remove(struct i2c_client *client) { - struct regulator_dev **rdev = i2c_get_clientdata(client); + struct max8660 *max8660 = i2c_get_clientdata(client); int i; for (i = 0; i < MAX8660_V_END; i++) - if (rdev[i]) - regulator_unregister(rdev[i]); - kfree(rdev); + if (max8660->rdev[i]) + regulator_unregister(max8660->rdev[i]); + kfree(max8660); return 0; } |
