diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2017-03-28 16:14:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-29 18:27:32 +0200 |
| commit | 2543ef3173889373fc07df61520e1bb42a99c85e (patch) | |
| tree | 6afeff7e1028f2c11b327293626147865317e8e6 /drivers | |
| parent | Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topi... (diff) | |
| download | linux-2543ef3173889373fc07df61520e1bb42a99c85e.tar.xz linux-2543ef3173889373fc07df61520e1bb42a99c85e.zip | |
regulator: arizona-micsupp: 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/arizona-micsupp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c index fcb98dbda837..0ed14e41de11 100644 --- a/drivers/regulator/arizona-micsupp.c +++ b/drivers/regulator/arizona-micsupp.c @@ -197,7 +197,8 @@ static const struct regulator_init_data arizona_micsupp_ext_default = { .num_consumer_supplies = 1, }; -static int arizona_micsupp_of_get_pdata(struct arizona *arizona, +static int arizona_micsupp_of_get_pdata(struct device *dev, + struct arizona *arizona, struct regulator_config *config, const struct regulator_desc *desc) { @@ -211,7 +212,7 @@ static int arizona_micsupp_of_get_pdata(struct arizona *arizona, if (np) { config->of_node = np; - init_data = of_get_regulator_init_data(arizona->dev, np, desc); + init_data = of_get_regulator_init_data(dev, np, desc); if (init_data) { init_data->consumer_supplies = &micsupp->supply; @@ -266,8 +267,8 @@ static int arizona_micsupp_probe(struct platform_device *pdev) if (IS_ENABLED(CONFIG_OF)) { if (!dev_get_platdata(arizona->dev)) { - ret = arizona_micsupp_of_get_pdata(arizona, &config, - desc); + ret = arizona_micsupp_of_get_pdata(&pdev->dev, arizona, + &config, desc); if (ret < 0) return ret; } |