From patchwork Mon Apr 26 15:05:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 95085 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 o3QF59Pe015114 for ; Mon, 26 Apr 2010 15:05:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752360Ab0DZPFH (ORCPT ); Mon, 26 Apr 2010 11:05:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48854 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752160Ab0DZPFG (ORCPT ); Mon, 26 Apr 2010 11:05:06 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id BBA408891E; Mon, 26 Apr 2010 17:05:04 +0200 (CEST) Date: Mon, 26 Apr 2010 17:05:03 +0200 From: Michal Hocko To: "Rafael J. Wysocki" Cc: Tony Vroon , Jesse Barnes , Matthew Garrett , linux-kernel@vger.kernel.org, ACPI Devel Maling List , pm list Subject: Re: commit 9630bdd9 changes behavior of the poweroff - bug? Message-ID: <20100426150503.GA4005@tiehlicka.suse.cz> References: <20100401133923.GA4104@tiehlicka.suse.cz> <20100419115942.GC5160@tiehlicka.suse.cz> <201004191719.53602.rjw@sisk.pl> <201004250435.42779.rjw@sisk.pl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201004250435.42779.rjw@sisk.pl> User-Agent: Mutt/1.5.20 (2009-06-14) 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, 26 Apr 2010 15:05:09 +0000 (UTC) diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c index fef7219..b6e1e0c 100644 --- a/drivers/acpi/acpica/evgpeblk.c +++ b/drivers/acpi/acpica/evgpeblk.c @@ -367,7 +367,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle, union acpi_operand_object *pkg_desc; union acpi_operand_object *obj_desc; u32 gpe_number; - acpi_status status; + acpi_status status = AE_OK; ACPI_FUNCTION_TRACE(ev_match_prw_and_gpe); @@ -447,12 +447,13 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle, gpe_block-> block_base_number]; + status = acpi_ev_disable_gpe(gpe_event_info); gpe_event_info->flags |= ACPI_GPE_CAN_WAKE; } cleanup: acpi_ut_remove_reference(pkg_desc); - return_ACPI_STATUS(AE_OK); + return_ACPI_STATUS(status); } /*******************************************************************************