From 9815f1c298f0564dc95f0603eb307124991cc601 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 5 Aug 2007 14:24:17 -0300 Subject: [PATCH] --- yaml --- r: 65731 b: refs/heads/master c: 39c4ad6ab364354bf76cdcc0081fa5c4422db907 h: refs/heads/master i: 65729: b991457a083fa4f8beec74c2a3a99d3ad89f5bd2 65727: b364090fa812701f4b79cd93a8d716efbce17bd7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25840/cx25840-core.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 39da47fe0f4e..b318085a6eda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9085009683dd46d95105eda14efa8bda403b459f +refs/heads/master: 39c4ad6ab364354bf76cdcc0081fa5c4422db907 diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c index 65ad7943dd9a..8f9c32613b45 100644 --- a/trunk/drivers/media/video/cx25840/cx25840-core.c +++ b/trunk/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.