From 124e53bcd57fd8a9fe1e3070f4f9cda8eadb9bf3 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 27 Jan 2010 23:47:56 +0100 Subject: [PATCH] --- yaml --- r: 181859 b: refs/heads/master c: 09c09bc618a4ceec387c57542031b4fc35826e16 h: refs/heads/master i: 181857: c80f1206f57ba034d45602f25ff406407bdd6ad3 181855: d431317dd62d1d55712ca5d3692ca21ea842c23f v: v3 --- [refs] | 2 +- trunk/kernel/power/swap.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eaca83ab8dfc..d0710d515ebf 100644 --- 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 index 09b2b0ae9e9d..1d575733d4e1 100644 --- 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);