diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 13:10:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 13:10:12 +1100 |
| commit | e3e2616289802e38e9a6841cf9e6ddc81d9b01c6 (patch) | |
| tree | 2414407d8a654e3ccb2028b0672424f71b15c90b /kernel/power/disk.c | |
| parent | a6fedadea8d89317fb0071c9d24c05a83dcb3f89 (diff) | |
| parent | 48fb0085023f7824b77257879781d816fb64a6bc (diff) | |
Merge commit 'acpi/test'
Conflicts:
drivers/acpi/blacklist.c
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index f77d3819ef57..45e8541ab7e3 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -258,12 +258,12 @@ int hibernation_snapshot(int platform_mode) { int error; - /* Free memory before shutting down devices. */ - error = swsusp_shrink_memory(); + error = platform_begin(platform_mode); if (error) return error; - error = platform_begin(platform_mode); + /* Free memory before shutting down devices. */ + error = swsusp_shrink_memory(); if (error) goto Close; |