Skip to content

Commit 883babd

Browse files
macromorgansre
authored andcommitted
power: supply: rk817: Change rk817_chg_cur_to_reg to int
Change return value of rk817_chg_cur_to_reg from u8 to int. If the function fails to find a suitable value it returns a -EINVAL, but defined as a u8 it would not return correctly. Additionally, change defined variable that stores return value from u8 to int. Fixes: 11cb8da ("power: supply: Add charger driver for Rockchip RK817") Signed-off-by: Chris Morgan <macromorgan@hotmail.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 172c65e commit 883babd

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/power/supply/rk817_charger.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ struct rk817_charger {
121121
#define ADC_TO_CHARGE_UAH(adc_value, res_div) \
122122
(adc_value / 3600 * 172 / res_div)
123123

124-
static u8 rk817_chg_cur_to_reg(u32 chg_cur_ma)
124+
static int rk817_chg_cur_to_reg(u32 chg_cur_ma)
125125
{
126126
if (chg_cur_ma >= 3500)
127127
return CHG_3_5A;
@@ -864,8 +864,8 @@ static int rk817_battery_init(struct rk817_charger *charger,
864864
{
865865
struct rk808 *rk808 = charger->rk808;
866866
u32 tmp, max_chg_vol_mv, max_chg_cur_ma;
867-
u8 max_chg_vol_reg, chg_term_i_reg, max_chg_cur_reg;
868-
int ret, chg_term_ma;
867+
u8 max_chg_vol_reg, chg_term_i_reg;
868+
int ret, chg_term_ma, max_chg_cur_reg;
869869
u8 bulk_reg[2];
870870

871871
/* Get initial plug state */

0 commit comments

Comments
 (0)