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

Commit bd26a74e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator fix from Mark Brown:
 "Fix some leaked OF node references in regulator drivers that have been
  left over following a fix on a fix to the reference counting"

* tag 'regulator-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: remove unnecessary of_node_get() to parent
parents 27180f7d b8b27a44

drivers/regulator/88pm8607.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int pm8607_regulator_dt_init(struct platform_device *pdev, 
				    struct regulator_config *config)

{

	struct device_node *nproot, *np;

	nproot = of_node_get(pdev->dev.parent->of_node);

	nproot = pdev->dev.parent->of_node;

	if (!nproot)

		return -ENODEV;

	nproot = of_get_child_by_name(nproot, "regulators");

drivers/regulator/da9052-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -422,9 +422,9 @@ static int da9052_regulator_probe(struct platform_device *pdev) 
		config.init_data = pdata->regulators[pdev->id];

	} else {

#ifdef CONFIG_OF

		struct device_node *nproot, *np;

		struct device_node *nproot = da9052->dev->of_node;

		struct device_node *np;



		nproot = of_node_get(da9052->dev->of_node);

		if (!nproot)

			return -ENODEV;

drivers/regulator/max8907-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int max8907_regulator_parse_dt(struct platform_device *pdev) 
	struct device_node *np, *regulators;

	int ret;



	np = of_node_get(pdev->dev.parent->of_node);

	np = pdev->dev.parent->of_node;

	if (!np)

		return 0;

drivers/regulator/max8925-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static int max8925_regulator_dt_init(struct platform_device *pdev, 
	struct device_node *nproot, *np;

	int rcount;



	nproot = of_node_get(pdev->dev.parent->of_node);

	nproot = pdev->dev.parent->of_node;

	if (!nproot)

		return -ENODEV;

	np = of_get_child_by_name(nproot, "regulators");

drivers/regulator/max8997.c

+1 −1
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev, 
	struct max8997_regulator_data *rdata;

	unsigned int i, dvs_voltage_nr = 1, ret;



	pmic_np = of_node_get(iodev->dev->of_node);

	pmic_np = iodev->dev->of_node;

	if (!pmic_np) {

		dev_err(&pdev->dev, "could not find pmic sub-node\n");

		return -ENODEV;