diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-06 11:28:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-06 11:28:48 +0000 |
| commit | c48c43aa2d90739e5aabb72d8a10ccacddfbe105 (patch) | |
| tree | 8bcffd0e37d93a9882b16969b9738770f1a468c4 | |
| parent | ac58291c753ac958512d9183495c966f7b577f2f (diff) | |
| parent | f40cbcb933367aa79fa881baff276b3a4566b563 (diff) | |
| download | linux-3.10-c48c43aa2d90739e5aabb72d8a10ccacddfbe105.tar.gz linux-3.10-c48c43aa2d90739e5aabb72d8a10ccacddfbe105.tar.bz2 linux-3.10-c48c43aa2d90739e5aabb72d8a10ccacddfbe105.zip | |
Merge remote-tracking branch 'regulator/fix/max8907' into tmp
| -rw-r--r-- | drivers/regulator/max8907-regulator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/max8907-regulator.c b/drivers/regulator/max8907-regulator.c index d1a77512d83..d40cf7fdb54 100644 --- a/drivers/regulator/max8907-regulator.c +++ b/drivers/regulator/max8907-regulator.c @@ -237,8 +237,7 @@ static int max8907_regulator_parse_dt(struct platform_device *pdev) return -EINVAL; } - ret = of_regulator_match(pdev->dev.parent, regulators, - max8907_matches, + ret = of_regulator_match(&pdev->dev, regulators, max8907_matches, ARRAY_SIZE(max8907_matches)); if (ret < 0) { dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", |