On Saturday, February 12, 2011, Stanislaw Gruszka wrote:
> Currently we return 0 in swsusp_alloc() when alloc_image_page() fail.
> Patch fixes that. Also remove unneeded "error" variable since only
> possible error is -ENOMEM.
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@xxxxx>
Good catch, thanks! Patch applied to suspend-2.6/linux-next.
Rafael
> ---
> 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 0dac75e..64db648 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)
>
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm
