From 6c224ac5993de3c82ba5f0ec81afa0c5a0217eeb Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sat, 11 Feb 2012 22:40:23 +0100 Subject: [PATCH] --- yaml --- r: 291853 b: refs/heads/master c: 6f585f750d792652f33b6e85b1ee205be4b5e572 h: refs/heads/master i: 291851: 8d290b615f6785e436e96976a5990e4912741f2c v: v3 --- [refs] | 2 +- trunk/kernel/power/power.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fb9defbfbf88..58b8e1bfadfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c83b4818dd65eb17e633b6b629a81da7bed90b3 +refs/heads/master: 6f585f750d792652f33b6e85b1ee205be4b5e572 diff --git a/trunk/kernel/power/power.h b/trunk/kernel/power/power.h index 21724eee5206..398d42b48e9e 100644 --- a/trunk/kernel/power/power.h +++ b/trunk/kernel/power/power.h @@ -234,16 +234,14 @@ static inline int suspend_freeze_processes(void) int error; error = freeze_processes(); - /* * freeze_processes() automatically thaws every task if freezing * fails. So we need not do anything extra upon error. */ if (error) - goto Finish; + return error; error = freeze_kernel_threads(); - /* * freeze_kernel_threads() thaws only kernel threads upon freezing * failure. So we have to thaw the userspace tasks ourselves. @@ -251,7 +249,6 @@ static inline int suspend_freeze_processes(void) if (error) thaw_processes(); - Finish: return error; }