From patchwork Mon Jan 28 07:47:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 2053611 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 86664E00DA for ; Mon, 28 Jan 2013 07:49:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753724Ab3A1HtT (ORCPT ); Mon, 28 Jan 2013 02:49:19 -0500 Received: from mga09.intel.com ([134.134.136.24]:44081 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753263Ab3A1HtT (ORCPT ); Mon, 28 Jan 2013 02:49:19 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 27 Jan 2013 23:48:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,550,1355126400"; d="scan'208";a="253437935" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.36.117]) by orsmga001.jf.intel.com with ESMTP; 27 Jan 2013 23:49:17 -0800 From: Lan Tianyu To: rjw@sisk.pl Cc: Lan Tianyu , stern@rowland.harvard.edu, swilmet@gnome.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH 2/2] ACPI/Sleep: use init_nvs_nosave_s3() for Sony Vaio VPCCW29FX and VPCEB1S1E callback in the non-nvs blacklist Date: Mon, 28 Jan 2013 15:47:05 +0800 Message-Id: <1359359225-28223-2-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359359225-28223-1-git-send-email-tianyu.lan@intel.com> References: <1359359225-28223-1-git-send-email-tianyu.lan@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Sony Vaio VPCCW29FX and VPCEB1S1E just need to ban saving nvs during s3 rather than both s3 and s4. So this patch is to set their callbacks to be init_nvs_nosave_s3(). Signed-off-by: Lan Tianyu --- drivers/acpi/sleep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 405b962..ee33a9a 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -230,7 +230,7 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, }, { - .callback = init_nvs_nosave, + .callback = init_nvs_nosave_s3, .ident = "Sony Vaio VPCCW29FX", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), @@ -270,7 +270,7 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, }, { - .callback = init_nvs_nosave, + .callback = init_nvs_nosave_s3, .ident = "Sony Vaio VPCEB1S1E", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),