From patchwork Sun Feb 13 14:17:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 83077 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 BE459B7198 for ; Tue, 15 Feb 2011 00:26:58 +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 1PoyRy-0001eb-7E; Mon, 14 Feb 2011 13:26:46 +0000 Received: from smtprelay02.ispgateway.de ([80.67.18.44]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PocnR-0006lS-Cb for kernel-team@lists.ubuntu.com; Sun, 13 Feb 2011 14:19:29 +0000 Received: from [87.180.58.130] (helo=stokes.schwinge.homeip.net) by smtprelay02.ispgateway.de with esmtpa (Exim 4.68) (envelope-from ) id 1PocnQ-0003A7-Q1 for kernel-team@lists.ubuntu.com; Sun, 13 Feb 2011 15:19:29 +0100 Received: (qmail 8308 invoked from network); 13 Feb 2011 14:19:12 -0000 Received: from kepler.schwinge.homeip.net (192.168.111.7) by stokes.schwinge.homeip.net with QMQP; 13 Feb 2011 14:19:12 -0000 Received: (nullmailer pid 13423 invoked by uid 1000); Sun, 13 Feb 2011 14:19:11 -0000 From: Thomas Schwinge To: manoj.iyer@canonical.com, stefan.bader@canonical.com, brad.figg@canonical.com, kernel-team@lists.ubuntu.com Subject: =?UTF-8?q?=5BPATCH=5D=20Quirk=20to=20fix=20suspend/resume=20on=20another=20Lenovo=20ThinkPad=20Edge=2C=20model=20030246G=2E?= Date: Sun, 13 Feb 2011 15:17:46 +0100 Message-Id: <1297606666-13207-1-git-send-email-thomas@schwinge.name> X-Mailer: git-send-email 1.7.2.3 MIME-Version: 1.0 X-Df-Sender: thomas@schwinge.name X-Mailman-Approved-At: Mon, 14 Feb 2011 13:26:43 +0000 Cc: Thomas Schwinge 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: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://launchpad.net/bugs/702434 Signed-off-by: Thomas Schwinge --- Hallo! I had to apply this additional patch on top of ubuntu-maverick's Ubuntu-2.6.35-26.46 (my patch is building on top of Manoj's b95ee31d81f578162310e346a0b3277a65ac4a4d) in order to get suspend/resume working on my girlfriend's ThinkPad Edge. Previously, the machine would sort-of resume, but the screen stayed dark; remote SSH login was possible though. Grüße, Thomas arch/x86/kernel/acpi/boot.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 715abe9..8debd3b 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1461,6 +1461,15 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "030222U"), }, }, + /* Lenovo ThinkPad Edge, model 030246G */ + { + .callback = dmi_ignore_irq0_timer_override, + .ident = "ThinkPad Edge", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "030246G"), + }, + }, {} };