diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-07-10 13:45:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 22:24:22 +0200 |
| commit | aeceb15738958fe59cd9fe537f40317b1a3bc731 (patch) | |
| tree | 98ab1b493886dbd03eace4ebe6cde335b3523e00 | |
| parent | [PATCH] swsusp warning fix (diff) | |
| download | linux-aeceb15738958fe59cd9fe537f40317b1a3bc731.tar.xz linux-aeceb15738958fe59cd9fe537f40317b1a3bc731.zip | |
[PATCH] swsusp: fix panic when signature can't be read
Do not panic a machine when swsusp signature can't be read.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | kernel/power/swap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index a57c661c7e8a..f1dd146bd64d 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -311,8 +311,10 @@ static atomic_t io_done = ATOMIC_INIT(0); static int end_io(struct bio *bio, unsigned int num, int err) { - if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) - panic("I/O error reading memory image"); + if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) { + printk(KERN_ERR "I/O error reading swsusp image.\n"); + return -EIO; + } atomic_set(&io_done, 0); return 0; } |