From patchwork Fri Jan 28 22:03:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: riyer@nvidia.com X-Patchwork-Id: 515981 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 p0SM1nti003758 for ; Fri, 28 Jan 2011 22:01:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753047Ab1A1WBr (ORCPT ); Fri, 28 Jan 2011 17:01:47 -0500 Received: from hqemgate03.nvidia.com ([216.228.121.140]:10825 "EHLO hqemgate03.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752328Ab1A1WBq (ORCPT ); Fri, 28 Jan 2011 17:01:46 -0500 Received: from hqnvupgp02.nvidia.com (Not Verified[172.17.98.15]) by hqemgate03.nvidia.com id ; Fri, 28 Jan 2011 14:08:30 -0800 Received: from hqnvemgw01.nvidia.com ([172.17.108.22]) by hqnvupgp02.nvidia.com (PGP Universal service); Fri, 28 Jan 2011 14:01:44 -0800 X-PGP-Universal: processed; by hqnvupgp02.nvidia.com on Fri, 28 Jan 2011 14:01:44 -0800 Received: from thelma.nvidia.com (Not Verified[172.16.212.77]) by hqnvemgw01.nvidia.com with MailMarshal (v6, 7, 2, 8378) id ; Fri, 28 Jan 2011 14:01:42 -0800 Received: from localhost.localdomain (dhcp-172-17-149-227.nvidia.com [172.17.149.227]) by thelma.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id p0SM1fjQ018273; Fri, 28 Jan 2011 14:01:41 -0800 (PST) From: riyer@nvidia.com To: dmitry.torokhov@gmail.com Cc: olof@lixom.net, achew@nvidia.com, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, Rakesh Iyer Subject: [PATCH v1] input: tegra-kbc: Fix build error. Date: Fri, 28 Jan 2011 14:03:33 -0800 Message-Id: <1296252213-15003-1-git-send-email-riyer@nvidia.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@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]); Fri, 28 Jan 2011 22:01:50 +0000 (UTC) diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index 6ca903a..ac471b7 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c @@ -355,8 +355,8 @@ static void tegra_kbc_config_pins(struct tegra_kbc *kbc) for (i = 0; i < KBC_MAX_GPIO; i++) { u32 r_shft = 5 * (i % 6); u32 c_shft = 4 * (i % 8); - u32 r_mask = 0x1f << r_shift; - u32 c_mask = 0x0f << c_shift; + u32 r_mask = 0x1f << r_shft; + u32 c_mask = 0x0f << c_shft; u32 r_offs = (i / 6) * 4 + KBC_ROW_CFG0_0; u32 c_offs = (i / 8) * 4 + KBC_COL_CFG0_0; u32 row_cfg = readl(kbc->mmio + r_offs);