diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:42 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:42 -0400 |
| commit | f5549f5bd83dad45f92bb5299f3532ea166674bf (patch) | |
| tree | 6053d27a81fbb1f6935a932a87fa5c271326a8cf | |
| parent | 6c7bdf8e6300bc9e39d41e7dce651bb3f2503e32 (diff) | |
| parent | 5ee034e614a9e115763fa8d50ae18bf6a13b21d1 (diff) | |
Merge remote-tracking branch 'regulator/topic/tps65023' into regulator-next
| -rw-r--r-- | drivers/regulator/tps65023-regulator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c index a957579bd98b..3ef67a86115c 100644 --- a/drivers/regulator/tps65023-regulator.c +++ b/drivers/regulator/tps65023-regulator.c | |||
| @@ -293,7 +293,8 @@ static int tps_65023_probe(struct i2c_client *client, | |||
| 293 | 293 | ||
| 294 | /* Enable setting output voltage by I2C */ | 294 | /* Enable setting output voltage by I2C */ |
| 295 | regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2, | 295 | regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2, |
| 296 | TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ); | 296 | TPS65023_REG_CTRL2_CORE_ADJ, |
| 297 | TPS65023_REG_CTRL2_CORE_ADJ); | ||
| 297 | 298 | ||
| 298 | return 0; | 299 | return 0; |
| 299 | } | 300 | } |