From patchwork Mon Apr 12 23:01:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 92097 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3CLwvDs014635 for ; Mon, 12 Apr 2010 21:58:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754195Ab0DLV64 (ORCPT ); Mon, 12 Apr 2010 17:58:56 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:50792 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754177Ab0DLV6z (ORCPT ); Mon, 12 Apr 2010 17:58:55 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 53E7917877E; Mon, 12 Apr 2010 23:21:56 +0200 (CEST) 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 14193-07; Mon, 12 Apr 2010 23:21:49 +0200 (CEST) Received: from tosh.localnet (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 7F85E178329; Mon, 12 Apr 2010 23:21:49 +0200 (CEST) From: "Rafael J. Wysocki" To: Tony Vroon , Michal Hocko , Jesse Barnes Subject: Re: commit 9630bdd9 changes behavior of the poweroff - bug? Date: Tue, 13 Apr 2010 01:01:54 +0200 User-Agent: KMail/1.12.4 (Linux/2.6.34-rc3-rjw; KDE/4.3.5; x86_64; ; ) Cc: Matthew Garrett , linux-kernel@vger.kernel.org, ACPI Devel Maling List , pm list References: <20100401133923.GA4104@tiehlicka.suse.cz> <1270848027.3071.0.camel@localhost> <201004102136.43246.rjw@sisk.pl> In-Reply-To: <201004102136.43246.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201004130101.54117.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.3 (demeter.kernel.org [140.211.167.41]); Mon, 12 Apr 2010 21:58:57 +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 @@ -63,17 +63,17 @@ void acpi_enable_wakeup_device(u8 sleep_ list_for_each_safe(node, next, &acpi_wakeup_device_list) { struct acpi_device *dev = container_of(node, struct acpi_device, wakeup_list); + u8 action = ACPI_GPE_ENABLE; if (!dev->wakeup.flags.valid) continue; if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count) || sleep_state > (u32) dev->wakeup.sleep_state) - continue; + action = ACPI_GPE_DISABLE; - /* The wake-up power should have been enabled already. */ acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number, - ACPI_GPE_ENABLE); + action); } }