In current implementation, the address return from regulator_register()
is different from the address for regulator_unregister().
Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/ad5398.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c
index 15ff61d..a4be416 100644
--- a/drivers/regulator/ad5398.c
+++ b/drivers/regulator/ad5398.c
@@ -25,7 +25,7 @@ struct ad5398_chip_info {
unsigned int current_level;
unsigned int current_mask;
unsigned int current_offset;
- struct regulator_dev rdev;
+ struct regulator_dev *rdev;
};
static int ad5398_calc_current(struct ad5398_chip_info *chip,
@@ -211,7 +211,6 @@ MODULE_DEVICE_TABLE(i2c, ad5398_id);
static int __devinit ad5398_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- struct regulator_dev *rdev;
struct regulator_init_data *init_data = client->dev.platform_data;
struct ad5398_chip_info *chip;
const struct ad5398_current_data_format *df =
@@ -233,9 +232,10 @@ static int __devinit ad5398_probe(struct i2c_client *client,
chip->current_offset = df->current_offset;
chip->current_mask = (chip->current_level - 1) << chip->current_offset;
- rdev = regulator_register(&ad5398_reg, &client->dev, init_data, chip);
- if (IS_ERR(rdev)) {
- ret = PTR_ERR(rdev);
+ chip->rdev = regulator_register(&ad5398_reg, &client->dev,
+ init_data, chip);
+ if (IS_ERR(chip->rdev)) {
+ ret = PTR_ERR(chip->rdev);
dev_err(&client->dev, "failed to register %s %s\n",
id->name, ad5398_reg.name);
goto err;
@@ -254,7 +254,7 @@ static int __devexit ad5398_remove(struct i2c_client *client)
{
struct ad5398_chip_info *chip = i2c_get_clientdata(client);
- regulator_unregister(&chip->rdev);
+ regulator_unregister(chip->rdev);
kfree(chip);
return 0;
--
1.7.2
>-----Original Message-----
>From: Axel Lin [mailto:[email protected]]
>Sent: Wednesday, September 01, 2010 10:29 AM
>To: linux-kernel
>Cc: Liam Girdwood; Mark Brown; Zhang, Sonic
>Subject: [PATCH] regulator: ad5398 - fix a memory leak
>
>In current implementation, the address return from
>regulator_register() is different from the address for
>regulator_unregister().
>
Acked-by: Sonic Zhang <[email protected]>
>Signed-off-by: Axel Lin <[email protected]>
>---
> drivers/regulator/ad5398.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/regulator/ad5398.c
>b/drivers/regulator/ad5398.c index 15ff61d..a4be416 100644
>--- a/drivers/regulator/ad5398.c
>+++ b/drivers/regulator/ad5398.c
>@@ -25,7 +25,7 @@ struct ad5398_chip_info {
> unsigned int current_level;
> unsigned int current_mask;
> unsigned int current_offset;
>- struct regulator_dev rdev;
>+ struct regulator_dev *rdev;
> };
>
> static int ad5398_calc_current(struct ad5398_chip_info *chip,
>@@ -211,7 +211,6 @@ MODULE_DEVICE_TABLE(i2c, ad5398_id);
>static int __devinit ad5398_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
>- struct regulator_dev *rdev;
> struct regulator_init_data *init_data =
>client->dev.platform_data;
> struct ad5398_chip_info *chip;
> const struct ad5398_current_data_format *df = @@ -233,9
>+232,10 @@ static int __devinit ad5398_probe(struct i2c_client *client,
> chip->current_offset = df->current_offset;
> chip->current_mask = (chip->current_level - 1) <<
>chip->current_offset;
>
>- rdev = regulator_register(&ad5398_reg, &client->dev,
>init_data, chip);
>- if (IS_ERR(rdev)) {
>- ret = PTR_ERR(rdev);
>+ chip->rdev = regulator_register(&ad5398_reg, &client->dev,
>+ init_data, chip);
>+ if (IS_ERR(chip->rdev)) {
>+ ret = PTR_ERR(chip->rdev);
> dev_err(&client->dev, "failed to register %s %s\n",
> id->name, ad5398_reg.name);
> goto err;
>@@ -254,7 +254,7 @@ static int __devexit ad5398_remove(struct
>i2c_client *client) {
> struct ad5398_chip_info *chip = i2c_get_clientdata(client);
>
>- regulator_unregister(&chip->rdev);
>+ regulator_unregister(chip->rdev);
> kfree(chip);
>
> return 0;
>--
>1.7.2
>
>
>
>