---

yaml --- r: 181859 b: refs/heads/master c: 09c09bc h: refs/heads/master i: 181857: c80f120 181855: d431317 v: v3
git-mirror · Feb 26, 2010 · 124e53b · 124e53b
1 parent 90624df
commit 124e53b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b694e52ebdd439e4591d4a6651658026196174f6
+refs/heads/master: 09c09bc618a4ceec387c57542031b4fc35826e16
diff --git a/trunk/kernel/power/swap.c b/trunk/kernel/power/swap.c
@@ -657,10 +657,6 @@ int swsusp_read(unsigned int *flags_p)
 	struct swsusp_info *header;
 
 	*flags_p = swsusp_header->flags;
-	if (IS_ERR(resume_bdev)) {
-		pr_debug("PM: Image device not initialised\n");
-		return PTR_ERR(resume_bdev);
-	}
 
 	memset(&snapshot, 0, sizeof(struct snapshot_handle));
 	error = snapshot_write_next(&snapshot, PAGE_SIZE);