diff mbox series

[4/5] power: supply: ab8500: Rename charging algorithm psy

Message ID 20210713152709.871833-4-linus.walleij@linaro.org
State Accepted
Commit 661d10ee0f1be7e3e08267b8364439980d02a42c
Headers show
Series [1/5] power: supply: ab8500: Use library interpolation | expand

Commit Message

Linus Walleij July 13, 2021, 3:27 p.m. UTC 
If we rename the "abx500_chargalg" supply to "ab8500_chargalg"
as it should be named, the existing supplies are supplying that
supply but that was obviously not working since it had the
wrong name.

Now that the dependency kicks in we get a bunch
of NULL references from ab8500_chargalg_external_power_changed()
so check that the workqueue is allocated before we try to
queue work on it.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
 drivers/power/supply/ab8500_chargalg.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.31.1
diff mbox series

Patch

diff --git a/drivers/power/supply/ab8500_chargalg.c b/drivers/power/supply/ab8500_chargalg.c
index 8dd66eb18fd5..4ef34f64e9c0 100644
--- a/drivers/power/supply/ab8500_chargalg.c
+++ b/drivers/power/supply/ab8500_chargalg.c
@@ -1275,7 +1275,8 @@  static void ab8500_chargalg_external_power_changed(struct power_supply *psy)
 	 * Trigger execution of the algorithm instantly and read
 	 * all power_supply properties there instead
 	 */
-	queue_work(di->chargalg_wq, &di->chargalg_work);
+	if (di->chargalg_wq)
+		queue_work(di->chargalg_wq, &di->chargalg_work);
 }
 
 /**
@@ -1949,7 +1950,7 @@  static char *supply_interface[] = {
 };
 
 static const struct power_supply_desc ab8500_chargalg_desc = {
-	.name			= "abx500_chargalg",
+	.name			= "ab8500_chargalg",
 	.type			= POWER_SUPPLY_TYPE_BATTERY,
 	.properties		= ab8500_chargalg_props,
 	.num_properties		= ARRAY_SIZE(ab8500_chargalg_props),