diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-06 06:28:52 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-06 06:28:52 -0500 |
| commit | e04702c8b275019944b2768981445ca0bee294e6 (patch) | |
| tree | 0289896f6233cb4e3645b5270fcafb043175d9a2 /drivers/regulator | |
| parent | 918d623b04ad80482542477f6dfa0bd47eca3771 (diff) | |
| parent | 5bce833c44d53ef5a31b844cf7678ddaeb406624 (diff) | |
Merge remote-tracking branch 'regulator/fix/tps65217' into tmp
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/tps65217-regulator.c | 4 |
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) | |||
| 305 | if (!regs) | 305 | if (!regs) |
| 306 | return NULL; | 306 | return NULL; |
| 307 | 307 | ||
| 308 | count = of_regulator_match(pdev->dev.parent, regs, | 308 | count = of_regulator_match(&pdev->dev, regs, reg_matches, |
| 309 | reg_matches, TPS65217_NUM_REGULATOR); | 309 | TPS65217_NUM_REGULATOR); |
| 310 | of_node_put(regs); | 310 | of_node_put(regs); |
| 311 | if ((count < 0) || (count > TPS65217_NUM_REGULATOR)) | 311 | if ((count < 0) || (count > TPS65217_NUM_REGULATOR)) |
| 312 | return NULL; | 312 | return NULL; |