Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / kernel / power / swap.c

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 09b2b0ae9e9d474fdc2f459f9741ab5545c4cf6c..1d575733d4e142f68ee3a43ea033ccb1882111c7 100644 (file)
--- a/kernel/power/swap.c
+++ b/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);