From patchwork Sun Sep 27 00:42:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrique de Moraes Holschuh X-Patchwork-Id: 50275 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8R0hQ5g031591 for ; Sun, 27 Sep 2009 00:43:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752952AbZI0Amt (ORCPT ); Sat, 26 Sep 2009 20:42:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752904AbZI0Amt (ORCPT ); Sat, 26 Sep 2009 20:42:49 -0400 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:56110 "EHLO out1.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752780AbZI0Amt (ORCPT ); Sat, 26 Sep 2009 20:42:49 -0400 Received: from compute1.internal (compute1.internal [10.202.2.41]) by gateway1.messagingengine.com (Postfix) with ESMTP id D835975B1B; Sat, 26 Sep 2009 20:42:52 -0400 (EDT) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Sat, 26 Sep 2009 20:42:52 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=from:to:cc:subject:date:message-id; s=smtpout; bh=ajn/RUKhR/yS/dAyLvEKM/VbMg8=; b=XlgJG+BeIRKKoMGdbvQF6bF1xkdVAf2yel8Gvtz1Rs5HgOhvus6GQcZ7m2onPI9FFD/f3hODjvUTnOeDPAUyQu97FPSuWczxNxnH6GuexTRU5kOCRgILwRznM+3W7lnr9NJOl3oQQ0BRLabNcSZ2TzBEZj9imtwA1lfYDVom8Dg= X-Sasl-enc: xcSSFt+HSUnow21baknJJ9ipkVnOrzwUI3/C6hdTX/CA 1254012172 Received: from khazad-dum.debian.net (unknown [201.82.170.176]) by mail.messagingengine.com (Postfix) with ESMTPSA id 67A435CB1D; Sat, 26 Sep 2009 20:42:52 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by localhost.khazad-dum.debian.net (Postfix) with ESMTP id AFA691001E; Sat, 26 Sep 2009 21:42:50 -0300 (BRT) X-Virus-Scanned: Debian amavisd-new at khazad-dum.debian.net Received: from khazad-dum.debian.net ([127.0.0.1]) by localhost (khazad-dum.debian.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 0Mec8ayclm1Y; Sat, 26 Sep 2009 21:42:50 -0300 (BRT) Received: by khazad-dum.debian.net (Postfix, from userid 1000) id E38051001C; Sat, 26 Sep 2009 21:42:49 -0300 (BRT) From: Henrique de Moraes Holschuh To: Len Brown Cc: linux-acpi@vger.kernel.org, ibm-acpi-devel@lists.sourceforge.net, Henrique de Moraes Holschuh Subject: thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem Date: Sat, 26 Sep 2009 21:42:49 -0300 Message-Id: <1254012169-31473-1-git-send-email-hmh@hmh.eng.br> X-Mailer: git-send-email 1.6.4.3 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Fix this problem when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined: CHECK drivers/platform/x86/thinkpad_acpi.c drivers/platform/x86/thinkpad_acpi.c:1968:21: error: not an lvalue CC [M] drivers/platform/x86/thinkpad_acpi.o drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_hotkey_driver_mask_set': drivers/platform/x86/thinkpad_acpi.c:1968: error: lvalue required as left operand of assignment Reported-by: Noah Dain Reported-by: Audrius Kazukauskas Signed-off-by: Henrique de Moraes Holschuh --- drivers/platform/x86/thinkpad_acpi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 3910f2f..d93108d 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -2235,7 +2235,9 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask) HOTKEY_CONFIG_CRITICAL_START hotkey_driver_mask = mask; +#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL hotkey_source_mask |= (mask & ~hotkey_all_mask); +#endif HOTKEY_CONFIG_CRITICAL_END rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) &