From 3ae1adc6ed93d55a27523f395284940fbe056401 Mon Sep 17 00:00:00 2001
From: "Nickolay V. Shmyrev" <nshmyrev@yandex.ru>
Date: Tue, 8 Nov 2005 21:37:39 -0800
Subject: [PATCH] v4l: 795: new config option for tda9887 to specifically set
 intercarrier

- New config option for tda9887 to specifically set intercarrier

Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
 drivers/media/video/tda9887.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'drivers/media/video/tda9887.c')

diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 3a7babef06f..796110d4ff7 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -464,6 +464,8 @@ static int tda9887_set_config(struct tda9887 *t, char *buf)
 			break;
 		}
 	}
+	if ((t->config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
+		buf[1] &= ~cQSS;
 	return 0;
 }
 
-- 
cgit v1.2.3-70-g09d2