Merge tag 'v6.7-rc6' into sched/core, to pick up fixes

[linux-2.6-microblaze.git] / kernel / freezer.c

diff --git a/kernel/freezer.c b/kernel/freezer.c
index 43b1d1b..f57aaf9 100644 (file)
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -202,7 +202,7 @@ void __thaw_task(struct task_struct *p)
        if (WARN_ON_ONCE(freezing(p)))
                goto unlock;
 
-       if (task_call_func(p, __restore_freezer_state, NULL))
+       if (!frozen(p) || task_call_func(p, __restore_freezer_state, NULL))
                goto unlock;
 
        wake_up_state(p, TASK_FROZEN);