diff options
| author | Sebastian Reichel <sre@kernel.org> | 2018-08-16 22:19:22 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2018-08-16 22:19:22 +0200 |
| commit | 5198a48381455969aa1053a0ca2e4ce409be2fc2 (patch) | |
| tree | 881914c4a5349e45285d686b1a513c678fcd6894 /drivers/power/supply/axp288_charger.c | |
| parent | 3d779180c69261f5c713832e46763e38589c18d3 (diff) | |
| parent | cc44ba91166beb78f9cb29d5e3d41c0a2d0a7329 (diff) | |
| download | linux-5198a48381455969aa1053a0ca2e4ce409be2fc2.tar.bz2 | |
Merge branch 'psy-fixes' into psy-next
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power/supply/axp288_charger.c')
| -rw-r--r-- | drivers/power/supply/axp288_charger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/axp288_charger.c b/drivers/power/supply/axp288_charger.c index 6e1bc14c3304..735658ee1c60 100644 --- a/drivers/power/supply/axp288_charger.c +++ b/drivers/power/supply/axp288_charger.c @@ -718,7 +718,7 @@ static int charger_init_hw_regs(struct axp288_chrg_info *info) } /* Determine charge current limit */ - cc = (ret & CHRG_CCCV_CC_MASK) >> CHRG_CCCV_CC_BIT_POS; + cc = (val & CHRG_CCCV_CC_MASK) >> CHRG_CCCV_CC_BIT_POS; cc = (cc * CHRG_CCCV_CC_LSB_RES) + CHRG_CCCV_CC_OFFSET; info->cc = cc; |