From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 20 Jun 2011 11:25:58 +0000 (+0100)
Subject: mfd: Ensure value written by wm831x_set_bits() is within the mask
X-Git-Tag: v3.1-rc1~100^2~21
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b00cd68eb3f6c81525e43f6259b65665ef32499a;p=~emulex%2Finfiniband.git

mfd: Ensure value written by wm831x_set_bits() is within the mask

Purely for defensiveness.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 772fe584f3b..baae9e47bff 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/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);