From patchwork Wed Feb 29 06:52:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keng-Yu Lin X-Patchwork-Id: 143671 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 2E777B6FE4 for ; Wed, 29 Feb 2012 17:52:51 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S2dOx-0001KR-M6; Wed, 29 Feb 2012 06:52:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S2dOw-0001KM-Dk for kernel-team@lists.ubuntu.com; Wed, 29 Feb 2012 06:52:38 +0000 Received: from 220-138-100-130.dynamic.hinet.net ([220.138.100.130] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1S2dOv-00052S-Cp for kernel-team@lists.ubuntu.com; Wed, 29 Feb 2012 06:52:38 +0000 From: Keng-Yu Lin To: kernel-team@lists.ubuntu.com Subject: [Precise/Oneric SRU] ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR Date: Wed, 29 Feb 2012 14:52:25 +0800 Message-Id: <1330498345-22077-2-git-send-email-kengyu@canonical.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1330498345-22077-1-git-send-email-kengyu@canonical.com> References: <1330498345-22077-1-git-send-email-kengyu@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The models do not resume correctly without acpi_sleep=nonvs. Signed-off-by: Keng-Yu Lin Signed-off-by: Rafael J. Wysocki (cherry picked from commit 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c) BugLink: http://bugs.launchpad.net/bugs/898503 Signed-off-by: Keng-Yu Lin Acked-by: Stefan Bader Acked-by: Colin Ian King --- drivers/acpi/sleep.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 6d9a3ab..0a7ed69 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -476,6 +476,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"), }, }, + { + .callback = init_nvs_nosave, + .ident = "Asus K54C", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "K54C"), + }, + }, + { + .callback = init_nvs_nosave, + .ident = "Asus K54HR", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"), + }, + }, {}, }; #endif /* CONFIG_SUSPEND */