From patchwork Mon Mar 11 15:53:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rabin Vincent X-Patchwork-Id: 2249291 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 00A893FC8F for ; Mon, 11 Mar 2013 15:54:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752063Ab3CKPy2 (ORCPT ); Mon, 11 Mar 2013 11:54:28 -0400 Received: from eu1sys200aog110.obsmtp.com ([207.126.144.129]:46947 "EHLO eu1sys200aog110.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868Ab3CKPy1 (ORCPT ); Mon, 11 Mar 2013 11:54:27 -0400 Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKUT3+GAPuqTw++7PuL2ztxnXecK3hC4+S@postini.com; Mon, 11 Mar 2013 15:54:18 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 62640BE; Mon, 11 Mar 2013 15:53:33 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 0A5AF4DB5; Mon, 11 Mar 2013 15:53:33 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id BC9DCA8072; Mon, 11 Mar 2013 16:53:26 +0100 (CET) Received: from localhost (10.211.9.58) by exdcvycastm022.EQ1STM.local (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 11 Mar 2013 16:53:32 +0100 From: Rabin Vincent To: Dmitry Torokhov Cc: , , Rabin Vincent Subject: [PATCH] Input: tc3589x-keypad - fix row shift Date: Mon, 11 Mar 2013 16:53:22 +0100 Message-ID: <1363017202-4556-1-git-send-email-rabin.vincent@stericsson.com> X-Mailer: git-send-email 1.8.1.5 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Since 1932811f426fee ("Input: matrix-keymap - uninline and prepare for device tree support"), the row_shift used by the driver does not match the one used by matrix_keypad_build_keymap(), leading to misdetection of keys. Fix it. Cc: # 3.8 Signed-off-by: Rabin Vincent Acked-by: Linus Walleij --- drivers/input/keyboard/tc3589x-keypad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/keyboard/tc3589x-keypad.c b/drivers/input/keyboard/tc3589x-keypad.c index 208de7c..4ce924d 100644 --- a/drivers/input/keyboard/tc3589x-keypad.c +++ b/drivers/input/keyboard/tc3589x-keypad.c @@ -163,7 +163,7 @@ static int tc3589x_keypad_init_key_hardware(struct tc_keypad *keypad) #define TC35893_DATA_REGS 4 #define TC35893_KEYCODE_FIFO_EMPTY 0x7f #define TC35893_KEYCODE_FIFO_CLEAR 0xff -#define TC35893_KEYPAD_ROW_SHIFT 0x3 +#define TC35893_KEYPAD_ROW_SHIFT 0x4 static irqreturn_t tc3589x_keypad_irq(int irq, void *dev) {