diff options
| author | Pavel Machek <pavel@ucw.cz> | 2004-12-12 16:32:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-12 16:32:01 -0800 |
| commit | 7032d83e7263863e188033170f53cd5c9befc066 (patch) | |
| tree | d6d93a80c16880ec1dec7922ac69eb883c3195c4 /kernel | |
| parent | 934aec1ec594a55effa30334e8cd4c27c151d72b (diff) | |
| download | history-7032d83e7263863e188033170f53cd5c9befc066.tar.gz | |
[PATCH] swsusp bugfixes: do not oops when not enough memory during resume
This prevents oops when not enough memory is available during resume.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/swsusp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index cd496ed25be4a3..d9c7504f158f9d 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c @@ -985,6 +985,8 @@ static int __init swsusp_pagedir_relocate(void) c = *c; free_pages((unsigned long)f, pagedir_order); } + if (ret) + return ret; printk("|\n"); return check_pagedir(); } |