]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
power: supply: cpcap-charger: Add missing power_supply_config
authorTony Lindgren <tony@atomide.com>
Thu, 15 Jun 2017 04:41:08 +0000 (21:41 -0700)
committerSebastian Reichel <sebastian.reichel@collabora.co.uk>
Thu, 15 Jun 2017 08:16:59 +0000 (10:16 +0200)
Otherwise cpcap-battery won't probe properly with the power-supplies
property configured but will fail with "Not all required supplies found,
defer probe".

Cc: Marcel Partap <mpartap@gmx.net>
Cc: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
drivers/power/supply/cpcap-charger.c

index a798af4471d77a813e8cd2f96ac66750e21de4c9..11a07633de6cd81abb55dc0ce17ae7e8e6691294 100644 (file)
@@ -601,6 +601,7 @@ static int cpcap_charger_probe(struct platform_device *pdev)
 {
        struct cpcap_charger_ddata *ddata;
        const struct of_device_id *of_id;
+       struct power_supply_config psy_cfg = {};
        int error;
 
        of_id = of_match_device(of_match_ptr(cpcap_charger_id_table),
@@ -629,9 +630,12 @@ static int cpcap_charger_probe(struct platform_device *pdev)
 
        atomic_set(&ddata->active, 1);
 
+       psy_cfg.of_node = pdev->dev.of_node;
+       psy_cfg.drv_data = ddata;
+
        ddata->usb = devm_power_supply_register(ddata->dev,
                                                &cpcap_charger_usb_desc,
-                                               NULL);
+                                               &psy_cfg);
        if (IS_ERR(ddata->usb)) {
                error = PTR_ERR(ddata->usb);
                dev_err(ddata->dev, "failed to register USB charger: %i\n",