From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0280335A930; Tue, 16 Dec 2025 12:14:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765887292; cv=none; b=E5ehLZHLIxvEGgeBhZ0/8pnTJv0PbCMhcsH0+oiQGukT1vFGyKFVlNb6xeJx6zZvetavm3jUQP2cnE3VX9+ojh6J0KLtNNLpgknvlL2YDyrl9aUDu+C2LkNCmCG2PmExKv9Wunss56GBr6+XTtEOVUANiIjl36gpS0gK8RQBo3c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765887292; c=relaxed/simple; bh=zli94L4yEkYoyfZMuvGlGB/V2JC0MsXp1bTjgaeZP6k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GjEQpNw7oCPo0yUJfb01TMmJMgKJ/kMer1oAQn1nMby1iNTM2hTmFLjTrpbMUkhI3Fc5JoejqFlNYn2xMipd4TrI/4sgdAD7Ph+N9tvAadpDWTJXx157n3n3NQaw3QLu2Ph1CqCTcdXHpfoGptCQVhJHwJ1+EGj04NeCIWiDM34= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YEOGCv37; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YEOGCv37" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 272EEC4CEF1; Tue, 16 Dec 2025 12:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765887291; bh=zli94L4yEkYoyfZMuvGlGB/V2JC0MsXp1bTjgaeZP6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YEOGCv371bGK58IymvHnXo3dyULMWpQ5zhJL2aZKVMsJvUqukjy400RgSP+tEX4z5 fdG8WOx9lLBCh4nGetvbaAo1Gt3Ql8Z4RkumVfNxmc58WiQqPzEME6gHud+YBfvVVp E/1a2GLx/tZrsfgHrfydrFBdR7v9XZdZr6BjiQrU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ahelenia=20Ziemia=C5=84ska?= , Sebastian Reichel , Sasha Levin Subject: [PATCH 6.18 186/614] power: supply: apm_power: only unset own apm_get_power_status Date: Tue, 16 Dec 2025 12:09:13 +0100 Message-ID: <20251216111408.112902634@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111401.280873349@linuxfoundation.org> References: <20251216111401.280873349@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ahelenia Ziemiańska [ Upstream commit bd44ea12919ac4e83c9f3997240fe58266aa8799 ] Mirroring drivers/macintosh/apm_emu.c, this means that modprobe apm_power && modprobe $anotherdriver && modprobe -r apm_power leaves $anotherdriver's apm_get_power_status instead of deleting it. Fixes: 3788ec932bfd ("[BATTERY] APM emulation driver for class batteries") Signed-off-by: Ahelenia Ziemiańska Link: https://patch.msgid.link/xczpgox57hxbunkcbdl5fxhc4gnsajsipldfidi7355afezk64@tarta.nabijaczleweli.xyz Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- drivers/power/supply/apm_power.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/apm_power.c b/drivers/power/supply/apm_power.c index 9236e00785786..9933cdc5c387a 100644 --- a/drivers/power/supply/apm_power.c +++ b/drivers/power/supply/apm_power.c @@ -364,7 +364,8 @@ static int __init apm_battery_init(void) static void __exit apm_battery_exit(void) { - apm_get_power_status = NULL; + if (apm_get_power_status == apm_battery_apm_get_power_status) + apm_get_power_status = NULL; } module_init(apm_battery_init); -- 2.51.0