瀏覽代碼

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>
Mark Brown 14 年之前
父節點
當前提交
b00cd68eb3
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/mfd/wm831x-core.c

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