mirror of
https://github.com/torvalds/linux
synced 2024-09-20 11:07:02 +00:00
Merge remote-tracking branch 'regulator/fix/max8907' into tmp
This commit is contained in:
commit
c48c43aa2d
|
@ -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",
|
||||||
|
|
Loading…
Reference in a new issue