[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 <[email protected]>
Acked-by: "Rafael J. Wysocki" <[email protected]>
Cc: Pavel Machek <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Con Kolivas 2006-03-26 01:37:11 -08:00 • committed by Linus Torvalds
commit e655a250d5

View file

@ -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;
if (!snapshot_image_loaded(snapshot))
error = -ENODATA;
}
return error;
}