diff options
| author | Steven Toth <stoth@kernellabs.com> | 2011-10-10 11:09:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-14 17:19:07 -0300 |
| commit | 52422e3cb146ef643fc0dbe74fa80f1abbe5fc37 (patch) | |
| tree | 6bba289fd44d44175f7ef9329165bacb30223961 /drivers/media/video/cx25840/cx25840-core.c | |
| parent | 33cdeb35f559270d2c51ed641df69a9ac659bc22 (diff) | |
[media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx25840/cx25840-core.c')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index 0316e41b55cd..cd9976408ab3 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/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); |