Commit 395d68e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.17-rc5' of... 

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

Pull regulator fix from Mark Brown:
 "One fix for sy7636a which got confused about which device to use to
  manage the lifecycle of the power good GPIO because it's looked up
  from the parent device due to the way DT bindings work"

* tag 'regulator-fix-v6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: sy7636a: fix lifecycle of power good gpio
parents b891d11b c05d0b32

drivers/regulator/sy7636a-regulator.c

+4 −3
Original line number Diff line number Diff line
@@ -83,9 +83,11 @@ static int sy7636a_regulator_probe(struct platform_device *pdev) 
	if (!regmap)

		return -EPROBE_DEFER;



	gdp = devm_gpiod_get(pdev->dev.parent, "epd-pwr-good", GPIOD_IN);

	device_set_of_node_from_dev(&pdev->dev, pdev->dev.parent);



	gdp = devm_gpiod_get(&pdev->dev, "epd-pwr-good", GPIOD_IN);

	if (IS_ERR(gdp)) {

		dev_err(pdev->dev.parent, "Power good GPIO fault %ld\n", PTR_ERR(gdp));

		dev_err(&pdev->dev, "Power good GPIO fault %ld\n", PTR_ERR(gdp));

		return PTR_ERR(gdp);

	}
@@ -105,7 +107,6 @@ static int sy7636a_regulator_probe(struct platform_device *pdev) 
	}



	config.dev = &pdev->dev;

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

	config.regmap = regmap;



	rdev = devm_regulator_register(&pdev->dev, &desc, &config);