lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'suspend-ioremap-cache' into release

Browse Source
This commit is contained in:
Len Brown
2011-01-12 04:56:08 -05:00
parent fb4af417cc 6d5bbf00d2
commit d16675e1f1
11 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/sleep.c
View File

@@ -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;
}