aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-06 11:28:52 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-06 11:28:52 +0000
commite04702c8b275019944b2768981445ca0bee294e6 (patch)
tree0289896f6233cb4e3645b5270fcafb043175d9a2
parent918d623b04ad80482542477f6dfa0bd47eca3771 (diff)
parent5bce833c44d53ef5a31b844cf7678ddaeb406624 (diff)
downloadlinux-stericsson-e04702c8b275019944b2768981445ca0bee294e6.tar.gz
Merge remote-tracking branch 'regulator/fix/tps65217' into tmp
-rw-r--r--drivers/regulator/tps65217-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c
index 73dce7664126..df395187c063 100644
--- a/drivers/regulator/tps65217-regulator.c
+++ b/drivers/regulator/tps65217-regulator.c
@@ -305,8 +305,8 @@ static struct tps65217_board *tps65217_parse_dt(struct platform_device *pdev)
if (!regs)
return NULL;
- count = of_regulator_match(pdev->dev.parent, regs,
- reg_matches, TPS65217_NUM_REGULATOR);
+ count = of_regulator_match(&pdev->dev, regs, reg_matches,
+ TPS65217_NUM_REGULATOR);
of_node_put(regs);
if ((count < 0) || (count > TPS65217_NUM_REGULATOR))
return NULL;