diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 04:56:08 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:56:08 -0500 |
| commit | d16675e1f1de98cc73ae77c6df26154ffae6230a (patch) | |
| tree | be7ffdaabdaa06f8c917c7a6c9919d4b5fd13a52 /drivers/acpi/sleep.c | |
| parent | fb4af417cce9ff87abf33a6bb9a0cf613e285364 (diff) | |
| parent | 6d5bbf00d251cc73223a71422d69e069dc2e0b8d (diff) | |
| download | blackbird-op-linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.tar.gz blackbird-op-linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.zip | |
Merge branch 'suspend-ioremap-cache' into release
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 5 |
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; } |
