From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794046614; b=WCsdLCVYVkWkXkhervqIH6v878EDazLCWRfra44lBrlMl0ld9OzYO3seyt2qtLsa7c6g ByPXsQ8DQpHWMc96KWGdL8jdB3zVNjXEpJ5LvlFWLVO0lLeWfxQ9fZ10+B2ldHQn4AwA7 sDSyABAj/7PzRLppvF94qvRZ9PNQKE5mKXPgL03h4INieR5s0EUXbtPG/QslyDqLy3p5V Fn+iAIt1414YSdLYwlM+M/rgj2IwumHJExlX0u5txZ79qxdse5g3dOlrfWm/y80ZvMLsL 6aT0Niai6QPPP42CkFTQReTm3BHN7JIMufvt7NHZVOXqBOsbJgkAVo+iRvj9EgiXviw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794046614; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=2vWUbAZanzps2fWyRTyrpNEw/hLwqNf3bGQxSolpl3A=; b=D7IXMA2sADC7rHFjkHWTNcVjptMWXTBFBxYgQFpwP0zmRPda0VKw/kZcqmw5HmVYWyPg YwUodg1/bKX7UgzNa9qs11vv/g9VGeW5N2wqbnn9TZ80NwGl+3ARPO8Ot3ZktRdV1re2d uUzR16wYLciJgj/TCJKx3CzySQ7FZv7t06hD/LzHKRDuPd3FojrbVl2T3/dUuzG5Od4kp J0CW8ZJ1dZ9foN/nW/NKvXFCG/N47wVBXPiVf+AErQMN0SINfN6K7C/Ip70xXux1yeqDB MoHsUwWpdI0Z8D6ItzLfu5BpTXyx23g1OoDOx6wuLACkMqw9k+K7bQRSGqAaPsvgVNw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cFHGZXy8; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54D7E6083623 for ; Sat, 7 Nov 2026 10:16:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cFHGZXy8 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A718B1F008A1; Sat, 7 Nov 2026 10:16:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794046614; bh=2vWUbAZanzps2fWyRTyrpNEw/hLwqNf3bGQxSolpl3A=; h=From:To:Cc:Subject:Date; b=cFHGZXy8OqauvrkCmiwYYduuG01QYA0PtSDg0SRCE5JaF6LkrdlYmOTRMY/3PdeGx cjUntfo24340tX06T7AGxmep3olCPREquvIarzoNTPsxqsvcKxnNI4mYQChlqtu+zU rdgPIElSHig4jP0vrOSg906GBJoapgNzZOODTBpDNSpHBuAz8aaP9/w2EmKIozunrB dMETFmQ5b3crY9Rfq8Qpn8mFolRQz7PwGs433b0AfpH8pk0TDGZfgcY56Xik3gsZIQ FEOlGnI2Euqe1xdbxVkPiqs2Or4wCwMU1fK48mmKNqdQtWsXtGmIws42dXP3EvMdM/ ZJs5TGvDCHc6w== From: Sasha Levin To: fanwu01@zju.edu.cn, songl@zju.edu.cn, sebastian.reichel@collabora.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] power: supply: bq27xxx: Ensure poll work is cancelled on remove" failed to apply to 6.12-stable tree Date: Sat, 7 Nov 2026 05:16:52 -0500 Message-ID: <20261107051652-failed-6.12-db560f4b1c52@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.12-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y git checkout FETCH_HEAD git cherry-pick -x db560f4b1c5253853f978385db066220e0c218dc # git commit -s git send-email --to '' --in-reply-to '20261107051652-failed-6.12-db560f4b1c52@kernel.org' --subject-prefix 'PATCH 6.12.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From db560f4b1c5253853f978385db066220e0c218dc Mon Sep 17 00:00:00 2001 From: Fan Wu Date: Thu, 3 Sep 2026 08:13:12 +0000 Subject: [PATCH] power: supply: bq27xxx: Ensure poll work is cancelled on remove The di->work poll work is queued from the poll callback itself and from bq27xxx_external_power_changed(). The cancel_delayed_work_sync() in bq27xxx_battery_teardown() runs while the power_supply is still registered, so external_power_changed() can re-arm the work after the cancel, and it runs after the driver data has been freed. Register a devm_delayed_work_autocancel() before devm_power_supply_register(), so on unwind the power_supply is unregistered first, after which no new external_power_changed() callback can be dispatched, and the poll work is cancelled only then. Drop the now-redundant cancel from bq27xxx_battery_teardown(). This issue was found by an in-house static analysis tool. Fixes: 740b755a3b34 ("bq27x00: Poll battery state") Cc: stable@vger.kernel.org Assisted-by: Codex:gpt-5.6 Co-developed-by: Song Li Signed-off-by: Song Li Signed-off-by: Fan Wu Link: https://patch.msgid.link/20260903081312.225535-1-fanwu01@zju.edu.cn Signed-off-by: Sebastian Reichel --- drivers/power/supply/bq27xxx_battery.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c index 4d4809a70b622..cd30993b8a89e 100644 --- a/drivers/power/supply/bq27xxx_battery.c +++ b/drivers/power/supply/bq27xxx_battery.c @@ -43,6 +43,7 @@ */ #include +#include #include #include #include @@ -2234,7 +2235,6 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di) }; int ret; - INIT_DELAYED_WORK(&di->work, bq27xxx_battery_poll); ret = devm_mutex_init(di->dev, &di->lock); if (ret) return ret; @@ -2255,6 +2255,12 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di) psy_desc->get_property = bq27xxx_battery_get_property; psy_desc->external_power_changed = bq27xxx_external_power_changed; + /* Cancel the poll work after the power_supply is unregistered. */ + ret = devm_delayed_work_autocancel(di->dev, &di->work, + bq27xxx_battery_poll); + if (ret) + return ret; + di->bat = devm_power_supply_register(di->dev, psy_desc, &psy_cfg); if (IS_ERR(di->bat)) return dev_err_probe(di->dev, PTR_ERR(di->bat), @@ -2281,8 +2287,6 @@ void bq27xxx_battery_teardown(struct bq27xxx_device_info *di) mutex_lock(&di->lock); di->removed = true; mutex_unlock(&di->lock); - - cancel_delayed_work_sync(&di->work); } EXPORT_SYMBOL_GPL(bq27xxx_battery_teardown); -- 2.53.0