]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
power: supply: axp288_charger: Move init_hw_regs call before supply registration
authorHans de Goede <hdegoede@redhat.com>
Wed, 21 Dec 2016 14:36:50 +0000 (15:36 +0100)
committerSebastian Reichel <sre@kernel.org>
Wed, 4 Jan 2017 21:02:47 +0000 (22:02 +0100)
Move the charger_init_hw_regs() above the power_supply_register call,
the axp288_charger_usb_set_property() uses axp288_chrg_info.max_cv and
.max_cc which get set by charger_init_hw_regs().

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/supply/axp288_charger.c

index 250dd700226f269eefc9ade57ef9a972c6d59840..1588efd88a1c6abba30052fb8ab5dc084a5694f8 100644 (file)
@@ -836,6 +836,10 @@ static int axp288_charger_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, info);
        mutex_init(&info->lock);
 
+       ret = charger_init_hw_regs(info);
+       if (ret)
+               return ret;
+
        /* Register with power supply class */
        charger_cfg.drv_data = info;
        info->psy_usb = devm_power_supply_register(dev, &axp288_charger_desc,
@@ -890,10 +894,6 @@ static int axp288_charger_probe(struct platform_device *pdev)
                }
        }
 
-       ret = charger_init_hw_regs(info);
-       if (ret)
-               return ret;
-
        return 0;
 }