Merge tag 'for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[linux-2.6-microblaze.git] / drivers / power / supply / rk817_charger.c

diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
index d25a81d..4f9c1c4 100644 (file)
--- a/drivers/power/supply/rk817_charger.c
+++ b/drivers/power/supply/rk817_charger.c
@@ -121,7 +121,7 @@ struct rk817_charger {
 #define ADC_TO_CHARGE_UAH(adc_value, res_div)  \
        (adc_value / 3600 * 172 / res_div)
 
-static u8 rk817_chg_cur_to_reg(u32 chg_cur_ma)
+static int rk817_chg_cur_to_reg(u32 chg_cur_ma)
 {
        if (chg_cur_ma >= 3500)
                return CHG_3_5A;
@@ -864,8 +864,8 @@ static int rk817_battery_init(struct rk817_charger *charger,
 {
        struct rk808 *rk808 = charger->rk808;
        u32 tmp, max_chg_vol_mv, max_chg_cur_ma;
-       u8 max_chg_vol_reg, chg_term_i_reg, max_chg_cur_reg;
-       int ret, chg_term_ma;
+       u8 max_chg_vol_reg, chg_term_i_reg;
+       int ret, chg_term_ma, max_chg_cur_reg;
        u8 bulk_reg[2];
 
        /* Get initial plug state */
@@ -1118,14 +1118,12 @@ static int rk817_charger_probe(struct platform_device *pdev)
 
        charger->bat_ps = devm_power_supply_register(&pdev->dev,
                                                     &rk817_bat_desc, &pscfg);
-
-       charger->chg_ps = devm_power_supply_register(&pdev->dev,
-                                                    &rk817_chg_desc, &pscfg);
-
-       if (IS_ERR(charger->chg_ps))
+       if (IS_ERR(charger->bat_ps))
                return dev_err_probe(dev, -EINVAL,
                                     "Battery failed to probe\n");
 
+       charger->chg_ps = devm_power_supply_register(&pdev->dev,
+                                                    &rk817_chg_desc, &pscfg);
        if (IS_ERR(charger->chg_ps))
                return dev_err_probe(dev, -EINVAL,
                                     "Charger failed to probe\n");