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

c48c43aa · Mark Brown · ac58291c · f40cbcb9 · c48c43aa
Commit c48c43aa authored Feb 06, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

drivers/regulator/max8907-regulator.c drivers/regulator/max8907-regulator.c +1 -2

No files found.
--- a/drivers/regulator/max8907-regulator.c
+++ b/drivers/regulator/max8907-regulator.c
@@ -237,8 +237,7 @@ static int max8907_regulator_parse_dt(struct platform_device *pdev)
 		return -EINVAL;
 	}

-	ret = of_regulator_match(pdev->dev.parent, regulators,
-				 max8907_matches,
+	ret = of_regulator_match(&pdev->dev, regulators, max8907_matches,
 				 ARRAY_SIZE(max8907_matches));
 	if (ret < 0) {
 		dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",