2010-08-06 05:34:01

by Axel Lin

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
---
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;
}
--
1.5.4.3



2010-08-06 08:42:37

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH] regulator: max8660 - fix a memory leak in max8660_remove()

On Fri, Aug 06, 2010 at 01:35:27PM +0800, Axel Lin wrote:
> In max8660_probe(), we allocate memory for max660.

Typo: max8660

> 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().

These two lines could go away IMHO as they are directly visible from the
code. Still, no real need for a resend from my side.

>
> Signed-off-by: Axel Lin <[email protected]>

Acked-by: Wolfram Sang <[email protected]>

Thanks for catching that!

--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |

Attachments:
(No filename) (825.00 B)
 signature.asc (198.00 B)
Digital signature Download all attachments

2010-08-06 11:29:06

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] regulator: max8660 - fix a memory leak in max8660_remove()

On Fri, Aug 06, 2010 at 01:35:27PM +0800, Axel Lin wrote:
> 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 <[email protected]>

Acked-by: Mark Brown <[email protected]>

2010-08-09 08:36:10

by Liam Girdwood

[permalink] [raw]
Subject: Re: [PATCH] regulator: max8660 - fix a memory leak in max8660_remove()

On Fri, 2010-08-06 at 13:35 +0800, Axel Lin wrote:
> 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 <[email protected]>
> ---
> drivers/regulator/max8660.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>

Applied.

Thanks

Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk