diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-06 06:28:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-06 06:28:53 -0500 |
commit | 53e5da79fa5222f2b810da7bf145e3a9f018dcc2 (patch) | |
tree | 2e7d1a41cd1a11e0cccc3b9ee7a173780669295b | |
parent | e04702c8b275019944b2768981445ca0bee294e6 (diff) | |
parent | 08337fdac215d8583770c34e7449c88947aceda8 (diff) |
Merge remote-tracking branch 'regulator/fix/tps65910' into tmp
-rw-r--r-- | drivers/regulator/tps65910-regulator.c | 2 |
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( | |||
998 | return NULL; | 998 | return NULL; |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | ret = of_regulator_match(pdev->dev.parent, regulators, matches, count); | 1001 | ret = of_regulator_match(&pdev->dev, regulators, matches, count); |
1002 | if (ret < 0) { | 1002 | if (ret < 0) { |
1003 | dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", | 1003 | dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", |
1004 | ret); | 1004 | ret); |