mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-26 00:51:02 +07:00
[media] wm8775: fix broken audio routing
Commit 5aa9ae5ed5
inverted the mute control
state test in s_routing which caused the audio routing to fail. This broke
ivtv support for the Hauppauge video/audio input bracket (which adds additional
video and audio inputs) all the way back in kernel 2.6.36.
This fix fixes the condition and it also removes a nonsense check on the
balance control.
Bisected-by: Rajil Saraswat <rajil.s@gmail.com>
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Reported-by: Rajil Saraswat <rajil.s@gmail.com>
Tested-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: stable@vger.kernel.org # for v3.10 and up
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
parent
dff04d34b1
commit
3af41a337a
@ -130,12 +130,10 @@ static int wm8775_s_routing(struct v4l2_subdev *sd,
|
||||
return -EINVAL;
|
||||
}
|
||||
state->input = input;
|
||||
if (!v4l2_ctrl_g_ctrl(state->mute))
|
||||
if (v4l2_ctrl_g_ctrl(state->mute))
|
||||
return 0;
|
||||
if (!v4l2_ctrl_g_ctrl(state->vol))
|
||||
return 0;
|
||||
if (!v4l2_ctrl_g_ctrl(state->bal))
|
||||
return 0;
|
||||
wm8775_set_audio(sd, 1);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user