UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Mark Brown 2012-11-28 19:24:48 +00:00
parent bd0ec7c1e5 9997f3ffbb
commit 5d6e6ffc40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/tps51632-regulator.c
View File

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