Commit 3d9b8b00 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-pm' 

Add a quirk for Lenovo G70-35 to save the ACPI NVS memory on system
suspend (Piotr Mazek)

* acpi-pm:
  ACPI: PM: Save NVS memory on Lenovo G70-35
parents 5ede9020 023cd6d9

drivers/acpi/sleep.c

+8 −0
Original line number Diff line number Diff line
@@ -386,6 +386,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "80E1"),

		},

	},

	{

	.callback = init_nvs_save_s3,

	.ident = "Lenovo G70-35",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_NAME, "80Q5"),

		},

	},

	/*

	 * ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using

	 * the Low Power S0 Idle firmware interface (see