summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@linaro.org>2025-05-27 08:45:21 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2025-05-27 15:26:50 +0200
commit39cdf87a97fdab067e82138ad4611b764f3eae15 (patch)
treeefdd9a2cd386c4a07f3f9e8dcf525f47ed0ec991
parent5836ebeb4a2b7e25305fab9170060d5f3de1ff30 (diff)
cpuidle: psci: Fix uninitialized variable in dt_idle_state_present()
If the first cpu_node = of_cpu_device_node_get() fails then the cleanup.h code will try to free "state_node" but it hasn't been initialized yet. Declare the device_nodes where they are initialized to fix this. Fixes: 5836ebeb4a2b ("cpuidle: psci: Avoid initializing faux device if no DT idle states are present") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/aDVRcfU8O8sez1x7@stanley.mountain Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/cpuidle/cpuidle-psci.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c
index 40f378c1dc9f..eef70b5259bc 100644
--- a/drivers/cpuidle/cpuidle-psci.c
+++ b/drivers/cpuidle/cpuidle-psci.c
@@ -440,14 +440,13 @@ static struct faux_device_ops psci_cpuidle_ops = {
static bool __init dt_idle_state_present(void)
{
- struct device_node *cpu_node __free(device_node);
- struct device_node *state_node __free(device_node);
-
- cpu_node = of_cpu_device_node_get(cpumask_first(cpu_possible_mask));
+ struct device_node *cpu_node __free(device_node) =
+ of_cpu_device_node_get(cpumask_first(cpu_possible_mask));
if (!cpu_node)
return false;
- state_node = of_get_cpu_state_node(cpu_node, 0);
+ struct device_node *state_node __free(device_node) =
+ of_get_cpu_state_node(cpu_node, 0);
if (!state_node)
return false;