[media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
authorSteven Toth <stoth@kernellabs.com>
Mon, 10 Oct 2011 14:09:55 +0000 (11:09 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 14 Oct 2011 20:19:07 +0000 (17:19 -0300)
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/cx25840/cx25840-core.c

index 0316e41..cd99764 100644 (file)
@@ -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);