From patchwork Thu Jan 6 22:36:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 461521 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 p06MjDlG020554 for ; Thu, 6 Jan 2011 22:45:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754667Ab1AFWoD (ORCPT ); Thu, 6 Jan 2011 17:44:03 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:37892 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753537Ab1AFWoA (ORCPT ); Thu, 6 Jan 2011 17:44:00 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id DC20D19D6BD; Thu, 6 Jan 2011 23:33:13 +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 15360-01; Thu, 6 Jan 2011 23:32:36 +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 B528519D7A8; Thu, 6 Jan 2011 23:32:08 +0100 (CET) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 5/11] ACPI / PM: Report wakeup events from buttons Date: Thu, 6 Jan 2011 23:36:01 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37+; KDE/4.4.4; x86_64; ; ) Cc: LKML , Matthew Garrett , ACPI Devel Maling List , "Linux-pm mailing list" References: <201101062331.17079.rjw@sisk.pl> In-Reply-To: <201101062331.17079.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201101062336.01492.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]); Thu, 06 Jan 2011 22:45:14 +0000 (UTC) Index: linux-2.6/drivers/acpi/button.c =================================================================== --- linux-2.6.orig/drivers/acpi/button.c +++ linux-2.6/drivers/acpi/button.c @@ -279,6 +279,9 @@ static int acpi_lid_send_state(struct ac input_report_switch(button->input, SW_LID, !state); input_sync(button->input); + if (state) + pm_wakeup_event(&device->dev, 0); + ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device); if (ret == NOTIFY_DONE) ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, @@ -314,6 +317,8 @@ static void acpi_button_notify(struct ac input_sync(input); input_report_key(input, keycode, 0); input_sync(input); + + pm_wakeup_event(&device->dev, 0); } acpi_bus_generate_proc_event(device, event, ++button->pushed);