From 11a3ee0438cae26fc7319a51d72915a2231f482a Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Wed, 24 Feb 2021 19:30:21 +0100 Subject: [PATCH] UPSTREAM: powercap/drivers/dtpm: Fix root node initialization The root node is not set to NULL when the dtpm root node is removed. Consequently, it is not possible to create a new root as it is already set. Set the root node to NULL when the last node is removed. Signed-off-by: Daniel Lezcano Signed-off-by: Rafael J. Wysocki Link: https://patchwork.kernel.org/project/linux-pm/patch/20210224183022.11846-1-daniel.lezcano@linaro.org/ Bug: 183374898 Change-Id: Idf56d61c16c451b9597d77c8e27372fbaede0ca3 (cherry picked from commit f3c141057976120148ca32d9d030a2256a5ffb7b) Signed-off-by: Ram Chandrasekar --- drivers/powercap/dtpm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c index 5a51cd34a7e8..c2185ec5f887 100644 --- a/drivers/powercap/dtpm.c +++ b/drivers/powercap/dtpm.c @@ -207,6 +207,9 @@ int dtpm_release_zone(struct powercap_zone *pcz) if (dtpm->ops) dtpm->ops->release(dtpm); + if (root == dtpm) + root = NULL; + kfree(dtpm); return 0;