diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-07-10 07:45:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 16:24:22 -0400 |
| commit | aeceb15738958fe59cd9fe537f40317b1a3bc731 (patch) | |
| tree | 98ab1b493886dbd03eace4ebe6cde335b3523e00 /kernel | |
| parent | 712f403af6682c942d8ff8bfbd54eed03643a796 (diff) | |
[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>
Diffstat (limited to 'kernel')
| -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); | |||
| 311 | 311 | ||
| 312 | static int end_io(struct bio *bio, unsigned int num, int err) | 312 | static int end_io(struct bio *bio, unsigned int num, int err) |
| 313 | { | 313 | { |
| 314 | if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) | 314 | if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) { |
| 315 | panic("I/O error reading memory image"); | 315 | printk(KERN_ERR "I/O error reading swsusp image.\n"); |
| 316 | return -EIO; | ||
| 317 | } | ||
| 316 | atomic_set(&io_done, 0); | 318 | atomic_set(&io_done, 0); |
| 317 | return 0; | 319 | return 0; |
| 318 | } | 320 | } |
