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>

diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index fcb98dbda8379c76f79372a0266056275ef8815a..0ed14e41de116c6e46780d23730b5fc84e80bd7a 100644 (file)
--- 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;
                }