From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5049C32D42B; Sat, 30 May 2026 16:53:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160032; cv=none; b=IL+L4b83MNVMWDirgS046IUnSLFZnOd+qx6MsSk/Seymk6ALBPQg67DF1w1PTDB3Sw71ff1WSgusZr7HK5G0RhFAmSpfcic64QATnXkJK2ZOzycnpZ/3J8tAl4NeCw1QRNSVyI6L8FVhHldbd6PJQka4IQ6ycmpa3xnX2Mr4hvI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160032; c=relaxed/simple; bh=zQyecomYld/4p4z5VvSbtd5VotNbAltZ3LT1U02nJxY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gHTUiw3rCzBZ81P4Qh8KOPd/SRT65ETgmd/V++rvaJiJyDLL0eSkSH+xlaMbilfu+ruKdplL7ZrjYitTSm7EI4ujOpkO1OMDQtbLVyxsPqVIZ2AVelnrFrM2Y0wU0DyGnQ0m0XaREKssvRZmb8mV5oUauOEEmzzCuIGW7I+LNUU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ehky4h9d; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ehky4h9d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AA011F00893; Sat, 30 May 2026 16:53:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780160031; bh=6MODkI4QFyCslEJE5jilOMd9US3CtM3Ftr+vRiHfbr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ehky4h9dSy9RSmEsb+iq9sMyugqwg88hFGoR210Q6NowaPlmWbqc/FmSZUBZo3vzP 4c4YiaLzN93tNFfMilA2EyUpm9p3I2d6WkpqMZfqJ/ZxMgGVrm04AkzClGhMi1mdbG OvcYv5QZj3GdL2ftFRr4fgcMQ8TP3fph7HGF/nXQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Krzysztof Kozlowski , Hans de Goede , Chen-Yu Tsai , Sebastian Reichel Subject: [PATCH 6.1 225/969] power: supply: axp288_charger: Do not cancel work before initializing it Date: Sat, 30 May 2026 17:55:49 +0200 Message-ID: <20260530160306.666284221@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Krzysztof Kozlowski commit 658342fd75b582cbb06544d513171c3d645faead upstream. Driver registered devm handler to cancel_work_sync() before even the work was initialized, thus leading to possible warning from kernel/workqueue.c on (!work->func) check, if the error path was hit before the initialization happened. Use devm_work_autocancel() on each work item independently, which handles the initialization and handler to cancel work. Fixes: 165c2357744e ("power: supply: axp288_charger: Properly stop work on probe-error / remove") Cc: stable@vger.kernel.org Signed-off-by: Krzysztof Kozlowski Reviewed-by: Hans de Goede Reviewed-by: Chen-Yu Tsai Link: https://patch.msgid.link/20260220174938.672883-5-krzysztof.kozlowski@oss.qualcomm.com Signed-off-by: Sebastian Reichel Signed-off-by: Greg Kroah-Hartman --- drivers/power/supply/axp288_charger.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) --- a/drivers/power/supply/axp288_charger.c +++ b/drivers/power/supply/axp288_charger.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -821,14 +822,6 @@ static int charger_init_hw_regs(struct a return 0; } -static void axp288_charger_cancel_work(void *data) -{ - struct axp288_chrg_info *info = data; - - cancel_work_sync(&info->otg.work); - cancel_work_sync(&info->cable.work); -} - static int axp288_charger_probe(struct platform_device *pdev) { int ret, i, pirq; @@ -900,12 +893,12 @@ static int axp288_charger_probe(struct p } /* Cancel our work on cleanup, register this before the notifiers */ - ret = devm_add_action(dev, axp288_charger_cancel_work, info); + ret = devm_work_autocancel(dev, &info->cable.work, + axp288_charger_extcon_evt_worker); if (ret) return ret; /* Register for extcon notification */ - INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker); info->cable.nb.notifier_call = axp288_charger_handle_cable_evt; ret = devm_extcon_register_notifier_all(dev, info->cable.edev, &info->cable.nb); @@ -915,8 +908,12 @@ static int axp288_charger_probe(struct p } schedule_work(&info->cable.work); + ret = devm_work_autocancel(dev, &info->otg.work, + axp288_charger_otg_evt_worker); + if (ret) + return ret; + /* Register for OTG notification */ - INIT_WORK(&info->otg.work, axp288_charger_otg_evt_worker); info->otg.id_nb.notifier_call = axp288_charger_handle_otg_evt; if (info->otg.cable) { ret = devm_extcon_register_notifier(dev, info->otg.cable,