aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-08-05 14:24:17 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:04:56 -0300
commit39c4ad6ab364354bf76cdcc0081fa5c4422db907 (patch)
treeb730165939fea241ce6f66d998aa70816348b0bb /drivers/media/video
parent9085009683dd46d95105eda14efa8bda403b459f (diff)
downloadkernel_samsung_aries-39c4ad6ab364354bf76cdcc0081fa5c4422db907.zip
kernel_samsung_aries-39c4ad6ab364354bf76cdcc0081fa5c4422db907.tar.gz
kernel_samsung_aries-39c4ad6ab364354bf76cdcc0081fa5c4422db907.tar.bz2
V4L/DVB (5999): cx25840: add radio support.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 65ad794..8f9c326 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -251,7 +251,11 @@ static void input_change(struct i2c_client *client)
cx25840_and_or(client, 0x401, ~0x60, 0);
cx25840_and_or(client, 0x401, ~0x60, 0x60);
- if (std & V4L2_STD_525_60) {
+ if (state->radio) {
+ cx25840_write(client, 0x808, 0xf9);
+ cx25840_write(client, 0x80b, 0x00);
+ }
+ else if (std & V4L2_STD_525_60) {
/* Certain Hauppauge PVR150 models have a hardware bug
that causes audio to drop out. For these models the
audio standard must be set explicitly.