aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2017-03-28 10:14:38 -0400
committerMark Brown <broonie@kernel.org>2017-03-29 12:27:32 -0400
commit0feb837a42c95fee901e03f76a1266db85ceb6ec (patch)
treef611ecd88057948f4a2ca7f789d40b8e34c02166
parent2543ef3173889373fc07df61520e1bb42a99c85e (diff)
regulator: arizona-ldo1: Avoid potential memory leak reading init_data
The device argument passed to of_get_regulator_init_data is used to do some devres memory allocation. Currently the driver passes the MFD device pointer to this function, this could result in the init_data allocation being leaked if the regulator is unbound but the MFD isn't. Correct this issue by correctly passing the local platform device. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/arizona-ldo1.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 302b57cb89c6..cf558168664d 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -186,7 +186,8 @@ static const struct regulator_init_data arizona_ldo1_wm5110 = {
186 .num_consumer_supplies = 1, 186 .num_consumer_supplies = 1,
187}; 187};
188 188
189static int arizona_ldo1_of_get_pdata(struct arizona *arizona, 189static int arizona_ldo1_of_get_pdata(struct device *dev,
190 struct arizona *arizona,
190 struct regulator_config *config, 191 struct regulator_config *config,
191 const struct regulator_desc *desc) 192 const struct regulator_desc *desc)
192{ 193{
@@ -212,8 +213,7 @@ static int arizona_ldo1_of_get_pdata(struct arizona *arizona,
212 if (init_node) { 213 if (init_node) {
213 config->of_node = init_node; 214 config->of_node = init_node;
214 215
215 init_data = of_get_regulator_init_data(arizona->dev, init_node, 216 init_data = of_get_regulator_init_data(dev, init_node, desc);
216 desc);
217 217
218 if (init_data) { 218 if (init_data) {
219 init_data->consumer_supplies = &ldo1->supply; 219 init_data->consumer_supplies = &ldo1->supply;
@@ -283,7 +283,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
283 283
284 if (IS_ENABLED(CONFIG_OF)) { 284 if (IS_ENABLED(CONFIG_OF)) {
285 if (!dev_get_platdata(arizona->dev)) { 285 if (!dev_get_platdata(arizona->dev)) {
286 ret = arizona_ldo1_of_get_pdata(arizona, &config, desc); 286 ret = arizona_ldo1_of_get_pdata(&pdev->dev, arizona,
287 &config, desc);
287 if (ret < 0) 288 if (ret < 0)
288 return ret; 289 return ret;
289 } 290 }