From patchwork Sun Feb 7 18:32:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 77625 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 o17IbT83002469 for ; Sun, 7 Feb 2010 18:37:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754272Ab0BGShL (ORCPT ); Sun, 7 Feb 2010 13:37:11 -0500 Received: from liberdade.minaslivre.org ([72.232.254.139]:44291 "EHLO liberdade.minaslivre.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753824Ab0BGShL (ORCPT ); Sun, 7 Feb 2010 13:37:11 -0500 Received: from localhost.localdomain (unknown [201.80.31.20]) by liberdade.minaslivre.org (Postfix) with ESMTPSA id AAF8826221; Sun, 7 Feb 2010 16:31:59 -0200 (BRST) From: Thadeu Lima de Souza Cascardo To: linux-acpi@vger.kernel.org Cc: Thadeu Lima de Souza Cascardo , Henrique de Moraes Holschuh , ibm-acpi-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] thinkpad-acpi: setup hotkey polling after changing hotkey_driver_mask Date: Sun, 7 Feb 2010 16:32:07 -0200 Message-Id: <1265567528-1180-1-git-send-email-cascardo@holoscopio.com> X-Mailer: git-send-email 1.6.6.1 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]); Sun, 07 Feb 2010 18:37:29 +0000 (UTC) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index e67e4fe..d69749d 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -6272,6 +6272,11 @@ static int __init brightness_init(struct ibm_init_struct *iibm) tpacpi_hotkey_driver_mask_set(hotkey_driver_mask | TP_ACPI_HKEY_BRGHTUP_MASK | TP_ACPI_HKEY_BRGHTDWN_MASK);; + +#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL + hotkey_poll_setup(true); +#endif + return 0; } @@ -6903,6 +6908,10 @@ static int __init volume_init(struct ibm_init_struct *iibm) | TP_ACPI_HKEY_VOLDWN_MASK | TP_ACPI_HKEY_MUTE_MASK); +#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL + hotkey_poll_setup(true); +#endif + return 0; }