From 5dac1f58e193d4fc5b763de58f8c58a7c990dc75 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Sun, 26 Mar 2006 01:37:11 -0800
Subject: [PATCH] --- yaml --- r: 24038 b: refs/heads/master c:
 e655a250d5fc12b6dfe0d436180ba4a3bfffdc9f h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/swap.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1a1a5d98ce3f..ca9d78b2d67c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f4fd61fa7c13ea905dac18b9baa766a35b88485
+refs/heads/master: e655a250d5fc12b6dfe0d436180ba4a3bfffdc9f
diff --git a/trunk/kernel/power/swap.c b/trunk/kernel/power/swap.c
index 9177f3f73a6c..044b8e0c1025 100644
--- a/trunk/kernel/power/swap.c
+++ b/trunk/kernel/power/swap.c
@@ -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;
 }