From: Stanislaw Gruszka Date: Sat, 12 Feb 2011 20:06:51 +0000 (+0100) Subject: PM / Hibernate: Return error code when alloc_image_page() fails X-Git-Tag: v2.6.32.30~32 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fc1ff859e9e28379ae4cae181ff00469d7e79b73;p=karo-tx-linux.git PM / Hibernate: Return error code when alloc_image_page() fails commit 2e725a065b0153f0c449318da1923a120477633d upstream. Currently we return 0 in swsusp_alloc() when alloc_image_page() fails. Fix that. Also remove unneeded "error" variable since the only useful value of error is -ENOMEM. [rjw: Fixed up the changelog and changed subject.] Signed-off-by: Stanislaw Gruszka Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index fc9ed15dcf03..a8520b0d0cc8 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1466,11 +1466,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; @@ -1493,7 +1490,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)