aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-06 11:28:53 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-06 11:28:53 +0000
commit53e5da79fa5222f2b810da7bf145e3a9f018dcc2 (patch)
tree2e7d1a41cd1a11e0cccc3b9ee7a173780669295b /drivers/regulator
parentMerge remote-tracking branch 'regulator/fix/tps65217' into tmp (diff)
parentregulator: tps65910: Fix using wrong dev argument for calling of_regulator_match (diff)
downloadlinux-dev-53e5da79fa5222f2b810da7bf145e3a9f018dcc2.tar.xz
linux-dev-53e5da79fa5222f2b810da7bf145e3a9f018dcc2.zip
Merge remote-tracking branch 'regulator/fix/tps65910' into tmp
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps65910-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 59c3770fa77d..b0e4c0bc85c3 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -998,7 +998,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
return NULL;
}
- ret = of_regulator_match(pdev->dev.parent, regulators, matches, count);
+ ret = of_regulator_match(&pdev->dev, regulators, matches, count);
if (ret < 0) {
dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
ret);