lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2011-02-17 17:52:36 -08:00
parent c8b392e9ad 2e725a065b
commit 2a324ce7b7
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/power/snapshot.c
View File

@@ -1519,11 +1519,8 @@ static int
swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm, swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm,
unsigned int nr_pages, unsigned int nr_highmem) unsigned int nr_pages, unsigned int nr_highmem)
{ {
int error = 0;
if (nr_highmem > 0) { if (nr_highmem > 0) {
error = get_highmem_buffer(PG_ANY); if (get_highmem_buffer(PG_ANY))
if (error)
goto err_out; goto err_out;
if (nr_highmem > alloc_highmem) { if (nr_highmem > alloc_highmem) {
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: err_out:
swsusp_free(); swsusp_free();
return error; return -ENOMEM;
} }
asmlinkage int swsusp_save(void) asmlinkage int swsusp_save(void)