From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 13 Mar 2007 16:41:49 +0000 (-0300)
Subject: V4L/DVB (5408): Fix SECAM handling on saa7115
X-Git-Tag: v2.6.21-rc6~85^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9aaec4e83e687d23b78b38e331bbd6a10b96380;p=linux-2.6

V4L/DVB (5408): Fix SECAM handling on saa7115

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 7735b67589..4d5bbd859d 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -961,7 +961,7 @@ static void saa711x_set_v4lstd(struct i2c_client *client, v4l2_std_id std)
 			reg |= 0x10;
 		} else if (std == V4L2_STD_NTSC_M_JP) {
 			reg |= 0x40;
-		} else if (std == V4L2_STD_SECAM) {
+		} else if (std & V4L2_STD_SECAM) {
 			reg |= 0x50;
 		}
 		saa711x_write(client, R_0E_CHROMA_CNTL_1, reg);