summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorNicolae Rosia <nicolae.rosia@gmail.com>2016-10-13 13:47:53 +0300
committerTom Rini <trini@konsulko.com>2016-10-24 08:04:38 -0400
commit28a3a43d7be74000a0d480f6f32e31c5ff22d4bc (patch)
tree525690da9d482af91fcb4da2f3c9e7036506ff86 /drivers/power
parent805e3e00f24cf5d7f922a0e5a0cd0e08ce9a8c7b (diff)
power: twl6030: fix code refactoring
Commit a85362fb3e1fc7833723accddbbae431091d06b8 refactored the code but the register read ended up in the wrong if branch. Currently, the else branch checks a variable which is always 0. Signed-off-by: Nicolae Rosia <nicolae_rosia@mentor.com> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/twl6030.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 05c79be98f..cd532008bd 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -231,9 +231,9 @@ void twl6030_power_mmc_init(int dev_index)
/* Enable P1 output for VMMC */
twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE,
TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
-
- twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_PH_STS_BOOT, &value);
} else if (dev_index == 1) {
+ twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_PH_STS_BOOT,
+ &value);
/* BOOT2 indicates 1.8V/2.8V VAUX1 for eMMC */
if (value & TWL6030_PH_STS_BOOT2) {
/* 1.8V voltage output for VAUX1 */