diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:38:15 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:38:15 -0500 |
| commit | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (patch) | |
| tree | 82b60e24ce5457e2e21e00bfa3b2f171d7eb97ce /kernel/power/disk.c | |
| parent | d0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (diff) | |
| parent | ada9cfdd158abb8169873dc8e5ae39b1ec6ffa8c (diff) | |
| download | op-kernel-dev-3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77.zip op-kernel-dev-3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77.tar.gz | |
Merge branch 'suspend' into release
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 c9d7408..096fe48 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -259,12 +259,12 @@ int hibernation_snapshot(int platform_mode) { int error, ftrace_save; - /* 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; |
