Skip to content

L
linux
Commit c48c43aa authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents ac58291c f40cbcb9
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
drivers/regulator/max8907-regulator.c
View file @ c48c43aa
...@@ -237,8 +237,7 @@ static int max8907_regulator_parse_dt(struct platform_device *pdev) ...@@ -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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7