a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] swswsup: return correct load_image error

Browse Source 
If there's an error in load_image() we should return that without checking
snapshot_image_loaded.

Signed-off-by: Con Kolivas <kernel@kolivas.org>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Con Kolivas 2006-03-26 01:37:11 -08:00 committed by Linus Torvalds
parent 9f4fd61fa7
commit e655a250d5
1 changed files with 4 additions and 3 deletions

7
kernel/power/swap.c
View File

@ -454,10 +454,11 @@ static int load_image(struct swap_map_handle *handle,
nr_pages++; nr_pages++;
} }
} while (ret > 0); } while (ret > 0);
if (!error) if (!error) {
printk("\b\b\b\bdone\n"); printk("\b\b\b\bdone\n");
if (!snapshot_image_loaded(snapshot)) if (!snapshot_image_loaded(snapshot))
error = -ENODATA; error = -ENODATA;
}
return error; return error;
} }