---

yaml --- r: 65731 b: refs/heads/master c: 39c4ad6 h: refs/heads/master i: 65729: b991457 65727: b364090 v: v3
git-mirror · Oct 10, 2007 · 9815f1c · 9815f1c
1 parent 70b29bf
commit 9815f1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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.