Le jeudi 13 octobre 2016 à 13:47 +0300, Nicolae Rosia a écrit :
From: Nicolae Rosia nicolae.rosia@gmail.com
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.
Good catch! Sorry for including that regression in the first place, I should have checked the patch more thoroughly.
See comment below.
Signed-off-by: Nicolae Rosia nicolae_rosia@mentor.com
drivers/power/twl6030.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c index 05c79be..cd53200 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);
The indentation before &value is inconsistent with what is done in the rest of the file. I think you should either just move the line as it was or only use one extra tab indent for the new line. Since this file breaks the 80 chars limit in a few places, I would tend to prefer the former.
/* BOOT2 indicates 1.8V/2.8V VAUX1 for eMMC */ if (value & TWL6030_PH_STS_BOOT2) { /* 1.8V voltage output for VAUX1 */