Jiri Slaby ef7db2
From: Vincent Guittot <vincent.guittot@linaro.org>
Jiri Slaby ef7db2
Date: Thu, 2 Feb 2023 11:28:12 +0100
Jiri Slaby ef7db2
Subject: [PATCH] tools/lib/thermal: Fix thermal_sampling_exit()
Jiri Slaby ef7db2
References: bsc#1012628
Jiri Slaby ef7db2
Patch-mainline: 6.2.3
Jiri Slaby ef7db2
Git-commit: a29cbd76aaf63f5493e962aa2fbaadcdc4615143
Jiri Slaby ef7db2
Jiri Slaby ef7db2
[ Upstream commit a29cbd76aaf63f5493e962aa2fbaadcdc4615143 ]
Jiri Slaby ef7db2
Jiri Slaby ef7db2
thermal_sampling_init() suscribes to THERMAL_GENL_SAMPLING_GROUP_NAME group
Jiri Slaby ef7db2
so thermal_sampling_exit() should unsubscribe from the same group.
Jiri Slaby ef7db2
Jiri Slaby ef7db2
Fixes: 47c4b0de080a ("tools/lib/thermal: Add a thermal library")
Jiri Slaby ef7db2
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Jiri Slaby ef7db2
Link: https://lore.kernel.org/r/20230202102812.453357-1-vincent.guittot@linaro.org
Jiri Slaby ef7db2
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Jiri Slaby ef7db2
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Jiri Slaby ef7db2
Signed-off-by: Sasha Levin <sashal@kernel.org>
Jiri Slaby ef7db2
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Jiri Slaby ef7db2
---
Jiri Slaby ef7db2
 tools/lib/thermal/sampling.c | 2 +-
Jiri Slaby ef7db2
 1 file changed, 1 insertion(+), 1 deletion(-)
Jiri Slaby ef7db2
Jiri Slaby ef7db2
diff --git a/tools/lib/thermal/sampling.c b/tools/lib/thermal/sampling.c
Jiri Slaby ef7db2
index ee818f4e..70577423 100644
Jiri Slaby ef7db2
--- a/tools/lib/thermal/sampling.c
Jiri Slaby ef7db2
+++ b/tools/lib/thermal/sampling.c
Jiri Slaby ef7db2
@@ -54,7 +54,7 @@ int thermal_sampling_fd(struct thermal_handler *th)
Jiri Slaby ef7db2
 thermal_error_t thermal_sampling_exit(struct thermal_handler *th)
Jiri Slaby ef7db2
 {
Jiri Slaby ef7db2
 	if (nl_unsubscribe_thermal(th->sk_sampling, th->cb_sampling,
Jiri Slaby ef7db2
-				   THERMAL_GENL_EVENT_GROUP_NAME))
Jiri Slaby ef7db2
+				   THERMAL_GENL_SAMPLING_GROUP_NAME))
Jiri Slaby ef7db2
 		return THERMAL_ERROR;
Jiri Slaby ef7db2
 
Jiri Slaby ef7db2
 	nl_thermal_disconnect(th->sk_sampling, th->cb_sampling);
Jiri Slaby ef7db2
-- 
Jiri Slaby ef7db2
2.35.3
Jiri Slaby ef7db2