---

yaml --- r: 271969 b: refs/heads/master c: 52422e3 h: refs/heads/master i: 271967: 980172a v: v3
git-mirror · Oct 14, 2011 · cb5e8b7 · cb5e8b7
1 parent 359c8a4
commit cb5e8b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33cdeb35f559270d2c51ed641df69a9ac659bc22
+refs/heads/master: 52422e3cb146ef643fc0dbe74fa80f1abbe5fc37
diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c
@@ -1074,7 +1074,8 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
 		cx25840_write(client, 0x919, 0x01);
 	}
 
-	if (is_cx2388x(state) && (aud_input == CX25840_AUDIO7)) {
+	if (is_cx2388x(state) && ((aud_input == CX25840_AUDIO7) ||
+		(aud_input == CX25840_AUDIO6))) {
 		/* Configure audio from LR1 or LR2 input */
 		cx25840_write4(client, 0x910, 0);
 		cx25840_write4(client, 0x8d0, 0x63073);