---

yaml --- r: 328480 b: refs/heads/master c: 00ba7a5 h: refs/heads/master v: v3
git-mirror · Sep 10, 2012 · bfe2ee3 · bfe2ee3
1 parent fb0bd05
commit bfe2ee3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 	}