diff options
| author | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2005-11-09 06:37:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 16:56:19 +0100 |
| commit | 3ae1adc6ed93d55a27523f395284940fbe056401 (patch) | |
| tree | 8e8ccbed3d907c82b27154ff73d701d5f1782f14 /drivers/media | |
| parent | [PATCH] v4l: 794: added asound skyeye bttv card (diff) | |
| download | linux-3ae1adc6ed93d55a27523f395284940fbe056401.tar.xz linux-3ae1adc6ed93d55a27523f395284940fbe056401.zip | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/tda9887.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 6a85ba111fb1..cf17da836914 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c @@ -206,7 +206,7 @@ struct cx88_board cx88_boards[] = { .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT, + .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER_NTSC, .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 3a7babef06f4..796110d4ff72 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; } |