Merge branch 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/k…

…ernel/git/broonie/regulator into regulator-min Conflicts: drivers/regulator/tps51632-regulator.c
git-mirror · Nov 28, 2012 · 5d6e6ff · 5d6e6ff
2 parents bd0ec7c + 9997f3f
commit 5d6e6ff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
@@ -122,7 +122,7 @@ static int tps51632_dcdc_set_voltage_sel(struct regulator_dev *rdev,
 	if (selector > TPS51632_MAX_VSEL)
 		return -EINVAL;
 
-	ret = regmap_write(tps->regmap, TPS51632_VOLTAGE_SELECT_REG, selector);
+	ret = regmap_write(tps->regmap, reg, selector);
 	if (ret < 0)
 		dev_err(tps->dev, "reg write failed, err %d\n", ret);
 	return ret;