From 2b28fb9bb6cbbd7893b3f98d46c0aceb2188de60 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 20 Jun 2011 12:25:58 +0100
Subject: [PATCH] --- yaml --- r: 261879 b: refs/heads/master c:
 b00cd68eb3f6c81525e43f6259b65665ef32499a h: refs/heads/master i:   261877:
 21d3996b8fffc3538199df1289179d46d4512777   261875:
 35dd151f88d2b437ba96cc5854d6e2248a99a210   261871:
 f3c879ba38ceb03aa31de79e9492e7ab48fdef29 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/wm831x-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);