1 files changed, 16 insertions, 14 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 5d0486f1cfcd..754d59f95500 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -338,6 +338,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
                 },
         },
+        {
+        .callback = init_nvs_save_s3,
+        .ident = "Asus 1025C",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                DMI_MATCH(DMI_PRODUCT_NAME, "1025C"),
+                },
+        },
         /*
          * https://bugzilla.kernel.org/show_bug.cgi?id=189431
          * Lenovo G50-45 is a platform later than 2012, but needs nvs memory
@@ -718,9 +726,6 @@ static const struct acpi_device_id lps0_device_ids[] = {
 #define ACPI_LPS0_ENTRY         5
 #define ACPI_LPS0_EXIT          6
 
-#define ACPI_LPS0_SCREEN_MASK   ((1 << ACPI_LPS0_SCREEN_OFF) | (1 << ACPI_LPS0_SCREEN_ON))
-#define ACPI_LPS0_PLATFORM_MASK ((1 << ACPI_LPS0_ENTRY) | (1 << ACPI_LPS0_EXIT))
-
 static acpi_handle lps0_device_handle;
 static guid_t lps0_dsm_guid;
 static char lps0_dsm_func_mask;
@@ -924,17 +929,14 @@ static int lps0_device_attach(struct acpi_device *adev,
         if (out_obj && out_obj->type == ACPI_TYPE_BUFFER) {
                 char bitmask = *(char *)out_obj->buffer.pointer;
 
-                if ((bitmask & ACPI_LPS0_PLATFORM_MASK) == ACPI_LPS0_PLATFORM_MASK ||
-                    (bitmask & ACPI_LPS0_SCREEN_MASK) == ACPI_LPS0_SCREEN_MASK) {
-                        lps0_dsm_func_mask = bitmask;
-                        lps0_device_handle = adev->handle;
-                        /*
-                         * Use suspend-to-idle by default if the default
-                         * suspend mode was not set from the command line.
-                         */
-                        if (mem_sleep_default > PM_SUSPEND_MEM)
-                                mem_sleep_current = PM_SUSPEND_TO_IDLE;
-                }
+                lps0_dsm_func_mask = bitmask;
+                lps0_device_handle = adev->handle;
+                /*
+                 * Use suspend-to-idle by default if the default
+                 * suspend mode was not set from the command line.
+                 */
+                if (mem_sleep_default > PM_SUSPEND_MEM)
+                        mem_sleep_current = PM_SUSPEND_TO_IDLE;
 
                 acpi_handle_debug(adev->handle, "_DSM function mask: 0x%x\n",
                                   bitmask);