From: Steven Toth Date: Mon, 10 Oct 2011 14:09:55 +0000 (-0300) Subject: [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use X-Git-Tag: MMI-PSA29.97-13-9~18177^2~13 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=52422e3cb146ef643fc0dbe74fa80f1abbe5fc37;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab --- 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);