Commit 8b4709ec authored by Wolfram Sang's avatar Wolfram Sang Committed by Liam Girdwood

regulator: fix dangling pointers

Fix I2C-drivers which missed setting clientdata to NULL before freeing the
structure it points to. Also fix drivers which do this _after_ the structure
was freed already.
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 451a73cd
...@@ -243,8 +243,8 @@ static int __devexit max1586_pmic_remove(struct i2c_client *client) ...@@ -243,8 +243,8 @@ static int __devexit max1586_pmic_remove(struct i2c_client *client)
for (i = 0; i <= MAX1586_V6; i++) for (i = 0; i <= MAX1586_V6; i++)
if (rdev[i]) if (rdev[i])
regulator_unregister(rdev[i]); regulator_unregister(rdev[i]);
kfree(rdev);
i2c_set_clientdata(client, NULL); i2c_set_clientdata(client, NULL);
kfree(rdev);
return 0; return 0;
} }
......
...@@ -356,6 +356,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, ...@@ -356,6 +356,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
dev_info(info->dev, "Max8649 regulator device is detected.\n"); dev_info(info->dev, "Max8649 regulator device is detected.\n");
return 0; return 0;
out: out:
i2c_set_clientdata(client, NULL);
kfree(info); kfree(info);
return ret; return ret;
} }
...@@ -367,9 +368,9 @@ static int __devexit max8649_regulator_remove(struct i2c_client *client) ...@@ -367,9 +368,9 @@ static int __devexit max8649_regulator_remove(struct i2c_client *client)
if (info) { if (info) {
if (info->regulator) if (info->regulator)
regulator_unregister(info->regulator); regulator_unregister(info->regulator);
i2c_set_clientdata(client, NULL);
kfree(info); kfree(info);
} }
i2c_set_clientdata(client, NULL);
return 0; return 0;
} }
......
...@@ -470,8 +470,8 @@ static int __devexit max8660_remove(struct i2c_client *client) ...@@ -470,8 +470,8 @@ static int __devexit max8660_remove(struct i2c_client *client)
for (i = 0; i < MAX8660_V_END; i++) for (i = 0; i < MAX8660_V_END; i++)
if (rdev[i]) if (rdev[i])
regulator_unregister(rdev[i]); regulator_unregister(rdev[i]);
kfree(rdev);
i2c_set_clientdata(client, NULL); i2c_set_clientdata(client, NULL);
kfree(rdev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment