diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /kernel/power/disk.c | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 331f9836383f..c9d74083746f 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
| @@ -651,7 +651,7 @@ static int software_resume(void) | |||
| 651 | pr_debug("PM: Preparing processes for restore.\n"); | 651 | pr_debug("PM: Preparing processes for restore.\n"); |
| 652 | error = prepare_processes(); | 652 | error = prepare_processes(); |
| 653 | if (error) { | 653 | if (error) { |
| 654 | swsusp_close(); | 654 | swsusp_close(FMODE_READ); |
| 655 | goto Done; | 655 | goto Done; |
| 656 | } | 656 | } |
| 657 | 657 | ||