Browse Source

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

Mark Brown 12 years ago
parent
commit
c48c43aa2d
1 changed files with 1 additions and 2 deletions
  1. 1 2
      drivers/regulator/max8907-regulator.c

+ 1 - 2
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",