From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 28 Nov 2012 19:24:48 +0000 (+0000)
Subject: Merge branch 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572;p=linux-beck.git

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
---

5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572
diff --cc drivers/regulator/tps51632-regulator.c
index dce5eb3fa706,e88bfe48303a..7c4e8a6e1d5d
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@@ -119,10 -124,11 +119,10 @@@ static int tps51632_dcdc_set_voltage_se
  	if (tps->enable_pwm_dvfs)
  		reg = TPS51632_VOLTAGE_BASE_REG;
  
 -	vsel = selector + TPS51632_MIN_VSEL;
 -	if (vsel > TPS51632_MAX_VSEL)
 +	if (selector > TPS51632_MAX_VSEL)
  		return -EINVAL;
  
- 	ret = regmap_write(tps->regmap, TPS51632_VOLTAGE_SELECT_REG, selector);
 -	ret = regmap_write(tps->regmap, reg, vsel);
++	ret = regmap_write(tps->regmap, reg, selector);
  	if (ret < 0)
  		dev_err(tps->dev, "reg write failed, err %d\n", ret);
  	return ret;