---

yaml --- r: 261879 b: refs/heads/master c: b00cd68 h: refs/heads/master i: 261877: 21d3996 261875: 35dd151 261871: f3c879b v: v3
git-mirror · Jul 31, 2011 · 2b28fb9 · 2b28fb9
1 parent 3ec8e65
commit 2b28fb9
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: ec2328c30bf09fe31e77889090eeb1a965325f53
+refs/heads/master: b00cd68eb3f6c81525e43f6259b65665ef32499a
diff --git a/trunk/drivers/mfd/wm831x-core.c b/trunk/drivers/mfd/wm831x-core.c
@@ -295,7 +295,7 @@ int wm831x_set_bits(struct wm831x *wm831x, unsigned short reg,
 		goto out;
 
 	r &= ~mask;
-	r |= val;
+	r |= val & mask;
 
 	ret = wm831x_write(wm831x, reg, 2, &r);