Merge branch 'suspend-ioremap-cache' into release

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index ddc5cce508a1..75c232084740 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -124,8 +124,7 @@ static int acpi_pm_freeze(void)
 static int acpi_pm_pre_suspend(void)
 {
         acpi_pm_freeze();
-        suspend_nvs_save();
-        return 0;
+        return suspend_nvs_save();
 }
 
 /**
@@ -151,7 +150,7 @@ static int acpi_pm_prepare(void)
 {
         int error = __acpi_pm_prepare();
         if (!error)
-                acpi_pm_pre_suspend();
+                error = acpi_pm_pre_suspend();
 
         return error;
 }