From patchwork Sun Feb 6 14:24:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 535121 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p16EOHUn006289 for ; Sun, 6 Feb 2011 14:24:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752705Ab1BFOYQ (ORCPT ); Sun, 6 Feb 2011 09:24:16 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:47855 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752704Ab1BFOYQ convert rfc822-to-8bit (ORCPT ); Sun, 6 Feb 2011 09:24:16 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id E96D31A44AB; Sun, 6 Feb 2011 15:23:01 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 30965-02; Sun, 6 Feb 2011 15:22:45 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id C67BA1A45BF; Sun, 6 Feb 2011 15:22:45 +0100 (CET) From: "Rafael J. Wysocki" To: Len Brown Subject: [Updated][PATCH 1/2] ACPI / Wakeup: Enable button GPEs unconditionally during initialization Date: Sun, 6 Feb 2011 15:24:08 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.38-rc3+; KDE/4.4.4; x86_64; ; ) Cc: ACPI Devel Mailing List , LKML , Linux PM mailing list , Matthew Garrett , Ferenc =?utf-8?q?W=C3=A1gner?= References: <201102061418.56202.rjw@sisk.pl> <201102061420.17431.rjw@sisk.pl> In-Reply-To: <201102061420.17431.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201102061524.08578.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 06 Feb 2011 14:24:17 +0000 (UTC) Index: linux-2.6/drivers/acpi/wakeup.c =================================================================== --- linux-2.6.orig/drivers/acpi/wakeup.c +++ linux-2.6/drivers/acpi/wakeup.c @@ -86,8 +86,12 @@ int __init acpi_wakeup_device_init(void) struct acpi_device *dev = container_of(node, struct acpi_device, wakeup_list); - if (device_can_wakeup(&dev->dev)) + if (device_can_wakeup(&dev->dev)) { + /* Button GPEs are supposed to be always enabled. */ + acpi_enable_gpe(dev->wakeup.gpe_device, + dev->wakeup.gpe_number); device_set_wakeup_enable(&dev->dev, true); + } } mutex_unlock(&acpi_device_lock); return 0;