diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-05 15:46:18 -0500 | 
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-05 15:46:18 -0500 | 
| commit | 3fa04ecd72780da31ba8b329e148179bc24a9c7d (patch) | |
| tree | f5d462fd4aee086952d18f159f737c450ab46b3b /kernel/power/swap.c | |
| parent | 180b62a3d837613fcac3ce89576526423926c3c3 (diff) | |
| parent | 1cda707d52e51a6cafac0aef12d2bd7052d572e6 (diff) | |
Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34
Diffstat (limited to 'kernel/power/swap.c')
| -rw-r--r-- | kernel/power/swap.c | 4 | 
1 files changed, 0 insertions, 4 deletions
| diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 09b2b0ae9e9d..1d575733d4e1 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
| @@ -657,10 +657,6 @@ int swsusp_read(unsigned int *flags_p) | |||
| 657 | struct swsusp_info *header; | 657 | struct swsusp_info *header; | 
| 658 | 658 | ||
| 659 | *flags_p = swsusp_header->flags; | 659 | *flags_p = swsusp_header->flags; | 
| 660 | if (IS_ERR(resume_bdev)) { | ||
| 661 | pr_debug("PM: Image device not initialised\n"); | ||
| 662 | return PTR_ERR(resume_bdev); | ||
| 663 | } | ||
| 664 | 660 | ||
| 665 | memset(&snapshot, 0, sizeof(struct snapshot_handle)); | 661 | memset(&snapshot, 0, sizeof(struct snapshot_handle)); | 
| 666 | error = snapshot_write_next(&snapshot, PAGE_SIZE); | 662 | error = snapshot_write_next(&snapshot, PAGE_SIZE); | 
