From patchwork Sat Jul 3 23:31:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 110076 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o63NXJ76001559 for ; Sat, 3 Jul 2010 23:33:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755858Ab0GCXdS (ORCPT ); Sat, 3 Jul 2010 19:33:18 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:49192 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755782Ab0GCXdR (ORCPT ); Sat, 3 Jul 2010 19:33:17 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id C98CC1873FF; Sun, 4 Jul 2010 01:18:54 +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 24305-06; Sun, 4 Jul 2010 01:18:48 +0200 (CEST) Received: from ferrari.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 1E75817F712; Sun, 4 Jul 2010 01:18:48 +0200 (CEST) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH] ACPI: Fix bogus GPE test in acpi_bus_set_run_wake_flags() Date: Sun, 4 Jul 2010 01:31:39 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.35-rc3-rjw+; KDE/4.4.4; x86_64; ; ) Cc: ACPI Devel Maling List , Matthew Garrett , Linux PM MIME-Version: 1.0 Message-Id: <201007040131.39904.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]); Sat, 03 Jul 2010 23:33:44 +0000 (UTC) Index: linux-2.6/drivers/acpi/scan.c =================================================================== --- linux-2.6.orig/drivers/acpi/scan.c +++ linux-2.6/drivers/acpi/scan.c @@ -764,8 +764,9 @@ static void acpi_bus_set_run_wake_flags( return; } - status = acpi_get_gpe_status(NULL, device->wakeup.gpe_number, - &event_status); + status = acpi_get_gpe_status(device->wakeup.gpe_device, + device->wakeup.gpe_number, + &event_status); if (status == AE_OK) device->wakeup.flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HANDLE);