diff --git a/[refs] b/[refs]
index 8bb14100a108..473398134af0 100644
--- 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
index 772fe584f3b8..baae9e47bffb 100644
--- 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);