diff options
Diffstat (limited to 'drivers/acpi/sleep.c')
-rw-r--r-- | drivers/acpi/sleep.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index c423231b952b..fdd3aeeb6def 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -124,8 +124,7 @@ static int acpi_pm_freeze(void) | |||
124 | static int acpi_pm_pre_suspend(void) | 124 | static int acpi_pm_pre_suspend(void) |
125 | { | 125 | { |
126 | acpi_pm_freeze(); | 126 | acpi_pm_freeze(); |
127 | suspend_nvs_save(); | 127 | return suspend_nvs_save(); |
128 | return 0; | ||
129 | } | 128 | } |
130 | 129 | ||
131 | /** | 130 | /** |
@@ -151,7 +150,7 @@ static int acpi_pm_prepare(void) | |||
151 | { | 150 | { |
152 | int error = __acpi_pm_prepare(); | 151 | int error = __acpi_pm_prepare(); |
153 | if (!error) | 152 | if (!error) |
154 | acpi_pm_pre_suspend(); | 153 | error = acpi_pm_pre_suspend(); |
155 | 154 | ||
156 | return error; | 155 | return error; |
157 | } | 156 | } |
@@ -435,6 +434,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
435 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"), | 434 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"), |
436 | }, | 435 | }, |
437 | }, | 436 | }, |
437 | { | ||
438 | .callback = init_nvs_nosave, | ||
439 | .ident = "Averatec AV1020-ED2", | ||
440 | .matches = { | ||
441 | DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"), | ||
442 | DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"), | ||
443 | }, | ||
444 | }, | ||
438 | {}, | 445 | {}, |
439 | }; | 446 | }; |
440 | #endif /* CONFIG_SUSPEND */ | 447 | #endif /* CONFIG_SUSPEND */ |