2011-06-20 11:26:05

by Mark Brown

Subject: [PATCH] mfd: Ensure value written by wm831x_set_bits() is within the mask

Purely for defensiveness.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/mfd/wm831x-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 02c9109..6c53376 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -260,7 +260,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);

--
1.7.5.4

2011-06-20 14:57:15

by Samuel Ortiz

Subject: Re: [PATCH] mfd: Ensure value written by wm831x_set_bits() is within the mask

Hi Mark,

On Mon, Jun 20, 2011 at 12:25:58PM +0100, Mark Brown wrote:
> Purely for defensiveness.
Ok, applied too.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/