diff options
| author | Lan Tianyu <tianyu.lan@intel.com> | 2012-01-21 09:23:56 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-21 09:40:05 -0700 |
| commit | 83b8b916e8155afb4c48ae323cc54acbfccc71c3 (patch) | |
| tree | 2a55d1a89a5a0672541fc2190155d7782b88fb95 /drivers/acpi | |
| parent | 1a28fbbebe6bd7e3f0338663302b3b3ce500e088 (diff) | |
| download | kernel_samsung_smdk4412-83b8b916e8155afb4c48ae323cc54acbfccc71c3.zip kernel_samsung_smdk4412-83b8b916e8155afb4c48ae323cc54acbfccc71c3.tar.gz kernel_samsung_smdk4412-83b8b916e8155afb4c48ae323cc54acbfccc71c3.tar.bz2 | |
ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist.
commit 93f770846e8dedc5d9117bd4ad9d7efd18420627 upstream.
Sony Vaio VPCCW29FX does not resume correctly without
acpi_sleep=nonvs, so add it to the ACPI sleep blacklist.
https://bugzilla.kernel.org/show_bug.cgi?id=34722
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/sleep.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 0bd4832..79ddcde 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -422,6 +422,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, { .callback = init_nvs_nosave, + .ident = "Sony Vaio VPCCW29FX", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"), + }, + }, + { + .callback = init_nvs_nosave, .ident = "Averatec AV1020-ED2", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"), |