From: Mark Brown <broonie@linaro.org>
Date: Thu, 24 Oct 2013 10:11:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/tps65023' into regulator-next
X-Git-Tag: firefly_0821_release~176^2~5011^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f5549f5bd83dad45f92bb5299f3532ea166674bf;p=firefly-linux-kernel-4.4.55.git

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

f5549f5bd83dad45f92bb5299f3532ea166674bf
diff --cc drivers/regulator/tps65023-regulator.c
index a957579bd98b,f6e398240686..3ef67a86115c
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@@ -293,9 -293,25 +293,10 @@@ static int tps_65023_probe(struct i2c_c
  
  	/* 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;
 -
 - fail:
 -	while (--i >= 0)
 -		regulator_unregister(tps->rdev[i]);
 -	return error;
 -}
 -
 -static int tps_65023_remove(struct i2c_client *client)
 -{
 -	struct tps_pmic *tps = i2c_get_clientdata(client);
 -	int i;
 -
 -	for (i = 0; i < TPS65023_NUM_REGULATOR; i++)
 -		regulator_unregister(tps->rdev[i]);
 -	return 0;
  }
  
  static const struct tps_info tps65020_regs[] = {