summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPatrick Mochel <mochel@osdl.org>2003-09-08 01:12:02 -0700
committerPatrick Mochel <mochel@osdl.org>2003-09-08 01:12:02 -0700
commit7a8c63c2e1df341ce649be9fc51e35d2216e9eb7 (patch)
treec5810b0d629021528ce17bb11b6f27311fda1de7 /kernel
parent7b152f4f1df1ce6a7ee45ff887ad12f287b6d8a4 (diff)
[power] Simplify error handling in pm_suspend_prepare().
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index be4473cbf300..fc5b7a289097 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -71,17 +71,14 @@ static int suspend_prepare(u32 state)
if ((error = device_suspend(state)))
goto Finish;
-
return 0;
- Done:
- pm_restore_console();
- return error;
Finish:
if (pm_ops->finish)
pm_ops->finish(state);
Thaw:
thaw_processes();
- goto Done;
+ pm_restore_console();
+ return error;
}