diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-28 14:24:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-28 14:24:48 -0500 |
| commit | 5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572 (patch) | |
| tree | f28c0307e82adf901277ae4e877dd2db7b620317 /drivers/regulator | |
| parent | bd0ec7c1e52423429d9ee7b34e2c899f01db01b0 (diff) | |
| parent | 9997f3ffbbcde01bcd5966eeb26bc41243715021 (diff) | |
Merge branch 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-min
Conflicts:
drivers/regulator/tps51632-regulator.c
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/tps51632-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c index dce5eb3fa706..7c4e8a6e1d5d 100644 --- 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, | |||
| 122 | if (selector > TPS51632_MAX_VSEL) | 122 | if (selector > TPS51632_MAX_VSEL) |
| 123 | return -EINVAL; | 123 | return -EINVAL; |
| 124 | 124 | ||
| 125 | ret = regmap_write(tps->regmap, TPS51632_VOLTAGE_SELECT_REG, selector); | 125 | ret = regmap_write(tps->regmap, reg, selector); |
| 126 | if (ret < 0) | 126 | if (ret < 0) |
| 127 | dev_err(tps->dev, "reg write failed, err %d\n", ret); | 127 | dev_err(tps->dev, "reg write failed, err %d\n", ret); |
| 128 | return ret; | 128 | return ret; |