PM / Hibernate: Swap, remove useless check from swsusp_read()
authorJiri Slaby <jslaby@suse.cz>
Wed, 27 Jan 2010 22:47:56 +0000 (23:47 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 26 Feb 2010 19:39:11 +0000 (20:39 +0100)
It will never reach here if the sws_resume_bdev is erratic.
swsusp_read() is called only from software_resume(), but after
swsusp_check() which would catch the error state.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
kernel/power/swap.c

index 09b2b0a..1d57573 100644 (file)
@@ -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);