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

Commit c48c43aa authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/max8907' into tmp

parents ac58291c f40cbcb9

drivers/regulator/max8907-regulator.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -237,8 +237,7 @@ static int max8907_regulator_parse_dt(struct platform_device *pdev) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	ret = of_regulator_match(pdev->dev.parent, regulators,

	ret = of_regulator_match(&pdev->dev, regulators, max8907_matches,

				 max8907_matches,

				 ARRAY_SIZE(max8907_matches));

				 ARRAY_SIZE(max8907_matches));

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",

		dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",