From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date: Mon, 23 Feb 2009 15:12:58 +0000 (-0300)
Subject: V4L/DVB (10670): tw9910: bit mask operation fix on tw9910_mask_set.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1af1b7a2def2f0936fc95edb5dcb3871934b7852;p=deliverable%2Flinux.git

V4L/DVB (10670): tw9910: bit mask operation fix on tw9910_mask_set.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 8dc3ec79a06f..0558b22fd3fb 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -460,9 +460,11 @@ static int tw9910_mask_set(struct i2c_client *client, u8 command,
 			   u8 mask, u8 set)
 {
 	s32 val = i2c_smbus_read_byte_data(client, command);
+	if (val < 0)
+		return val;
 
 	val &= ~mask;
-	val |=  set;
+	val |= set & mask;
 
 	return i2c_smbus_write_byte_data(client, command, val);
 }