Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0feb837a authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2543ef31

drivers/regulator/arizona-ldo1.c

+5 −4
Original line number Diff line number Diff line
@@ -186,7 +186,8 @@ static const struct regulator_init_data arizona_ldo1_wm5110 = { 
	.num_consumer_supplies = 1,

};



static int arizona_ldo1_of_get_pdata(struct arizona *arizona,

static int arizona_ldo1_of_get_pdata(struct device *dev,

				     struct arizona *arizona,

				     struct regulator_config *config,

				     const struct regulator_desc *desc)

{
@@ -212,8 +213,7 @@ static int arizona_ldo1_of_get_pdata(struct arizona *arizona, 
	if (init_node) {

		config->of_node = init_node;



		init_data = of_get_regulator_init_data(arizona->dev, init_node,

						       desc);

		init_data = of_get_regulator_init_data(dev, init_node, desc);



		if (init_data) {

			init_data->consumer_supplies = &ldo1->supply;
@@ -283,7 +283,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev) 


	if (IS_ENABLED(CONFIG_OF)) {

		if (!dev_get_platdata(arizona->dev)) {

			ret = arizona_ldo1_of_get_pdata(arizona, &config, desc);

			ret = arizona_ldo1_of_get_pdata(&pdev->dev, arizona,

							&config, desc);

			if (ret < 0)

				return ret;

		}