lkml.org 
[lkml]   [2011]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[39/68] PM / Hibernate: Return error code when alloc_image_page() fails
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Stanislaw Gruszka <stf_xl@pop3.wp.pl>

    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 <stf_xl@wp.pl>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    kernel/power/snapshot.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    --- 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_

    err_out:
    swsusp_free();
    - return error;
    + return -ENOMEM;
    }

    asmlinkage int swsusp_save(void)



    \
     
     \ /
      Last update: 2011-02-28 17:49    [W:2.319 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site