Commit e655a250 authored Mar 26, 2006 by Con Kolivas Committed by Linus Torvalds Mar 26, 2006

[PATCH] swswsup: return correct load_image error



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>

parent 9f4fd61f

kernel/power/swap.c

+4 −3

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