diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 17:52:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 17:52:36 -0800 |
| commit | 2a324ce7b79a3a90cc2d4ade5d5f960a99000caa (patch) | |
| tree | e512801f47280fae8813ff2a102411a343a3c380 | |
| parent | c8b392e9ad7332b8e44f7f15dafa5fc837f7da8d (diff) | |
| parent | 2e725a065b0153f0c449318da1923a120477633d (diff) | |
| download | blackbird-op-linux-2a324ce7b79a3a90cc2d4ade5d5f960a99000caa.tar.gz blackbird-op-linux-2a324ce7b79a3a90cc2d4ade5d5f960a99000caa.zip | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Hibernate: Return error code when alloc_image_page() fails
| -rw-r--r-- | kernel/power/snapshot.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 0dac75ea4456..64db648ff911 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1519,11 +1519,8 @@ static int swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm, unsigned int nr_pages, unsigned int nr_highmem) { - int error = 0; - if (nr_highmem > 0) { - error = get_highmem_buffer(PG_ANY); - if (error) + if (get_highmem_buffer(PG_ANY)) goto err_out; if (nr_highmem > alloc_highmem) { nr_highmem -= alloc_highmem; @@ -1546,7 +1543,7 @@ swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm, err_out: swsusp_free(); - return error; + return -ENOMEM; } asmlinkage int swsusp_save(void) |
