power: supply: apm_power: only unset own apm_get_power_status

[PATCH] power: supply: apm_power: only unset own apm_get_power_status

Posted by Ahelenia Ziemiańska 3 months, 3 weeks ago

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 <nabijaczleweli@nabijaczleweli.xyz>
---
 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 9236e0078578..9933cdc5c387 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.39.5

Re: [PATCH] power: supply: apm_power: only unset own apm_get_power_status

Posted by Sebastian Reichel 3 months, 1 week ago

On Fri, 17 Oct 2025 00:05:18 +0200, Ahelenia Ziemiańska wrote:
> 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.
> 
> 

Applied, thanks!

[1/1] power: supply: apm_power: only unset own apm_get_power_status
      commit: bd44ea12919ac4e83c9f3997240fe58266aa8799

Best regards,
-- 
Sebastian Reichel <sebastian.reichel@collabora.com>