diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:28:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:28:58 +0100 |
| commit | e2f4699ac15fe36de1288505bc6e6e5a8603ab1b (patch) | |
| tree | 8078d3ff21eaa0a0ed6e446ac94f3681e831cad1 /kernel/power/swap.c | |
| parent | rcu: Make task_subsys_state() RCU-lockdep checks handle boot-time use (diff) | |
| parent | Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-e2f4699ac15fe36de1288505bc6e6e5a8603ab1b.tar.xz linux-e2f4699ac15fe36de1288505bc6e6e5a8603ab1b.zip | |
Merge branch 'linus' into core/rcu
Merge reason: Backmerge latest upstream to queue up dependent fix in the
scheduler.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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) 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); |