LinuxLists.cc - [PATCH] regulator: max1586 - fix a memory leak in max1586_pmic

2010-08-06 05:31:51

Subject: [PATCH] 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 <[email protected]>
---
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 2b54d9d..8867c27 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,
}
}

- i2c_set_clientdata(client, rdev);
+ i2c_set_clientdata(client, max1586);
dev_info(&client->dev, "Maxim 1586 regulator driver loaded\n");
return 0;

@@ -238,13 +238,13 @@ out:

static int __devexit max1586_pmic_remove(struct i2c_client *client)
{
- struct regulator_dev **rdev = i2c_get_clientdata(client);
+ struct max1586_data *max1586 = i2c_get_clientdata(client);
int i;

for (i = 0; i <= MAX1586_V6; i++)
- if (rdev[i])
- regulator_unregister(rdev[i]);
- kfree(rdev);
+ if (max1586->rdev[i])
+ regulator_unregister(max1586->rdev[i]);
+ kfree(max1586);

return 0;
}
--
1.5.4.3

2010-08-06 08:45:51

by Wolfram Sang

[permalink] [raw]

Subject: Re: [PATCH] regulator: max1586 - fix a memory leak in max1586_pmic_remove()

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

Like with the max8660-patch:

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

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

Attachments:

(No filename) (706.00 B)
signature.asc (198.00 B)
Digital signature Download all attachments

2010-08-06 11:18:45

by Mark Brown

[permalink] [raw]

Subject: Re: [PATCH] regulator: max1586 - fix a memory leak in max1586_pmic_remove()

2010-08-07 09:46:43

by Robert Jarzmik

[permalink] [raw]

Subject: Re: [PATCH] regulator: max1586 - fix a memory leak in max1586_pmic_remove()

Axel Lin <[email protected]> writes:

> 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 <[email protected]>

Acked-by: Robert Jarzmik <[email protected]>

Cheers.

--
Robert

2010-08-09 08:29:16

by Liam Girdwood

[permalink] [raw]

Subject: Re: [PATCH] regulator: max1586 - fix a memory leak in max1586_pmic_remove()

On Fri, 2010-08-06 at 13:33 +0800, Axel Lin wrote:
> 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 <[email protected]>
> ---
> drivers/regulator/max1586.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