Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 291853
b: refs/heads/master
c: 6f585f7
h: refs/heads/master
i:
  291851: 8d290b6
v: v3
  • Loading branch information
Rafael J. Wysocki committed Feb 13, 2012
1 parent 17cd225 commit 6c224ac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6c83b4818dd65eb17e633b6b629a81da7bed90b3
refs/heads/master: 6f585f750d792652f33b6e85b1ee205be4b5e572
5 changes: 1 addition & 4 deletions trunk/kernel/power/power.h
Original file line number Diff line number Diff line change
Expand Up @@ -234,24 +234,21 @@ 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.
*/
if (error)
thaw_processes();

Finish:
return error;
}

Expand Down

0 comments on commit 6c224ac

Please sign in to comment.