Merge remote-tracking branch 'regulator/fix/tps65910' into tmp

53e5da79 · Mark Brown · e04702c8 · 08337fda · 53e5da79
Commit 53e5da79 authored Feb 06, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/tps65910-regulator.c drivers/regulator/tps65910-regulator.c +1 -1

No files found.
--- 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);