Merge remote-tracking branch 'regulator/topic/tps65023' into regulator-next

f5549f5b · Mark Brown · 6c7bdf8e · 5ee034e6 · f5549f5b
Commit f5549f5b authored Oct 24, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/regulator/tps65023-regulator.c drivers/regulator/tps65023-regulator.c +2 -1

No files found.
--- 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,

 	/* Enable setting output voltage by I2C */
 	regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
-			TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);
+					TPS65023_REG_CTRL2_CORE_ADJ,
+					TPS65023_REG_CTRL2_CORE_ADJ);

 	return 0;
 }