Commit 3fe0313e authored by Zhang Rui's avatar Zhang Rui Committed by Len Brown

Hibernate: Call platform_begin before swsusp_shrink_memory

Call platform_begin() before swsusp_shrink_memory() so that we can
always allocate enough memory to save the ACPI NVS region from
platform_begin().
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Acked-by: default avatarNigel Cunningham <nigel@tuxonice.net>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 929096fe
...@@ -259,12 +259,12 @@ int hibernation_snapshot(int platform_mode) ...@@ -259,12 +259,12 @@ int hibernation_snapshot(int platform_mode)
{ {
int error, ftrace_save; int error, ftrace_save;
/* Free memory before shutting down devices. */ error = platform_begin(platform_mode);
error = swsusp_shrink_memory();
if (error) if (error)
return error; return error;
error = platform_begin(platform_mode); /* Free memory before shutting down devices. */
error = swsusp_shrink_memory();
if (error) if (error)
goto Close; goto Close;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment