summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHongyan Xu <getshell@seu.edu.cn>2026-07-28 20:33:39 +0800
committerSebastian Reichel <sebastian.reichel@collabora.com>2026-07-31 00:00:44 +0200
commit60c5b8a9ef4dbc5d69bbc1a960fe55826cb3b643 (patch)
treee589dba5feef3854d27f51eca4542c51c5ce6857
parent84b3a9353e3f32ebd0dc5bf1ab378742bd7cb682 (diff)
downloadlinux-next-60c5b8a9ef4dbc5d69bbc1a960fe55826cb3b643.tar.gz
linux-next-60c5b8a9ef4dbc5d69bbc1a960fe55826cb3b643.zip
power: supply: isp1704_charger: cancel work on remove
The USB notifier and initial VBUS detection can schedule isp->work. The remove path unregisters the notifier and power supply, but does not wait for queued or running work before tearing down the power supply state. Cancel the work after unregistering the notifier. Do this before unregistering the power supply. This issue was found by a static analysis tool. Signed-off-by: Hongyan Xu <getshell@seu.edu.cn> Link: https://patch.msgid.link/20260728123423.781-5-getshell@seu.edu.cn Fixes: ec46475f3e31 ("power_supply: Add isp1704 charger detection driver") Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-rw-r--r--drivers/power/supply/isp1704_charger.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/supply/isp1704_charger.c b/drivers/power/supply/isp1704_charger.c
index 237912a92272..e329321d06db 100644
--- a/drivers/power/supply/isp1704_charger.c
+++ b/drivers/power/supply/isp1704_charger.c
@@ -482,6 +482,7 @@ static void isp1704_charger_remove(struct platform_device *pdev)
struct isp1704_charger *isp = platform_get_drvdata(pdev);
usb_unregister_notifier(isp->phy, &isp->nb);
+ cancel_work_sync(&isp->work);
power_supply_unregister(isp->psy);
isp1704_charger_set_power(isp, 0);
}