From bfe2ee309b0ec05f9e2b177336ecba1f6e6c1ec4 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Wed, 5 Sep 2012 12:01:57 +0300
Subject: [PATCH] --- yaml --- r: 328480 b: refs/heads/master c:
 00ba7a502d9a8ba49c54a88f5903bf7bfc33e449 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/pinctrl/pinctrl-single.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b9d1011fcf35..22b9a0fe5318 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4921e7452c2c61e0caa1a5039456cbeed3f10324
+refs/heads/master: 00ba7a502d9a8ba49c54a88f5903bf7bfc33e449
diff --git a/trunk/drivers/pinctrl/pinctrl-single.c b/trunk/drivers/pinctrl/pinctrl-single.c
index 76a4260f20f3..35086310b81d 100644
--- a/trunk/drivers/pinctrl/pinctrl-single.c
+++ b/trunk/drivers/pinctrl/pinctrl-single.c
@@ -337,7 +337,7 @@ static int pcs_enable(struct pinctrl_dev *pctldev, unsigned fselector,
 		vals = &func->vals[i];
 		val = pcs->read(vals->reg);
 		val &= ~pcs->fmask;
-		val |= vals->val;
+		val |= (vals->val & pcs->fmask);
 		pcs->write(val, vals->reg);
 	}