Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/fix/tps65217' into tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Feb 6, 2013
2 parents 918d623 + 5bce833 commit e04702c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/regulator/tps65217-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e04702c

Please sign in to comment.