summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/pinmux.c
diff options
context:
space:
mode:
authorJin Park <jinyoungp@nvidia.com>2011-08-19 17:11:42 +0900
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:48:25 -0800
commit083d93b8fb48a138d3dccbd2788b7c2a8bc4005a (patch)
tree79b3624117a3efe90a2be2dd56d092af995774b8 /arch/arm/mach-tegra/pinmux.c
parent71fd18281ec5b60e9f990d84b306700a35db68c0 (diff)
arm: tegra: pinmux: Fix RSVD search condition.
There is the potential problem in RSVD search routine, if mux function index is masked by 0x3. Original-Change-Id: Ieb823db5a304c0db6e898f29193d32bac3e34c38 Signed-off-by: Jin Park <jinyoungp@nvidia.com> Reviewed-on: http://git-master/r/48093 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Rebase-Id: Rdcf3a9747fab2f3aace0f7ee4b5b39f5ae497549
Diffstat (limited to 'arch/arm/mach-tegra/pinmux.c')
-rw-r--r--arch/arm/mach-tegra/pinmux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
index 71b5af6be4aa..41ea26994033 100644
--- a/arch/arm/mach-tegra/pinmux.c
+++ b/arch/arm/mach-tegra/pinmux.c
@@ -322,7 +322,7 @@ static int tegra_pinmux_set_func(const struct tegra_pingroup_config *config)
if (func & TEGRA_MUX_RSVD) {
for (i = 0; i < 4; i++) {
- if (pingroups[pg].funcs[i] & func)
+ if (pingroups[pg].funcs[i] & TEGRA_MUX_RSVD)
mux = i;
if (pingroups[pg].funcs[i] == func) {