]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
power: supply: bq27xxx_battery: Silence deferred-probe error
authorDmitry Osipenko <digetx@gmail.com>
Sun, 8 Mar 2020 21:51:43 +0000 (00:51 +0300)
committerStefan Bader <stefan.bader@canonical.com>
Thu, 14 May 2020 08:53:59 +0000 (10:53 +0200)
BugLink: https://bugs.launchpad.net/bugs/1875506
[ Upstream commit 583b53ece0b0268c542a1eafadb62e3d4b0aab8c ]

The driver fails to probe with -EPROBE_DEFER if battery's power supply
(charger driver) isn't ready yet and this results in a bit noisy error
message in KMSG during kernel's boot up. Let's silence the harmless
error message.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Reviewed-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/power/supply/bq27xxx_battery.c

index 51f0961ecf3e015c5ff9752d8999ac1281c48e34..a7d8cadf172cb24704b8a840b5cbf887cb4d2724 100644 (file)
@@ -1842,7 +1842,10 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di)
 
        di->bat = power_supply_register_no_ws(di->dev, psy_desc, &psy_cfg);
        if (IS_ERR(di->bat)) {
-               dev_err(di->dev, "failed to register battery\n");
+               if (PTR_ERR(di->bat) == -EPROBE_DEFER)
+                       dev_dbg(di->dev, "failed to register battery, deferring probe\n");
+               else
+                       dev_err(di->dev, "failed to register battery\n");
                return PTR_ERR(di->bat);
        }