summaryrefslogtreecommitdiff
path: root/drivers/media/i2c/wm8775.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-11-11 18:02:52 +0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-29 20:34:54 +0400
commit3af41a337a5b270de3e65466a07f106ad97ad0c6 (patch)
tree561b78f42892aabd22d0c4e0b29d10ef9008d4eb /drivers/media/i2c/wm8775.c
parentdff04d34b1171bc33e30ef391c2d2ce7be2beb98 (diff)
downloadlinux-3af41a337a5b270de3e65466a07f106ad97ad0c6.tar.xz
[media] wm8775: fix broken audio routing
Commit 5aa9ae5ed5d449a85fbf7aac3d1fdc241c542a79 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>
Diffstat (limited to 'drivers/media/i2c/wm8775.c')
-rw-r--r--drivers/media/i2c/wm8775.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/i2c/wm8775.c b/drivers/media/i2c/wm8775.c
index 3f584a7d0781..bee7946faa7c 100644
--- a/drivers/media/i2c/wm8775.c
+++ b/drivers/media/i2c/wm8775.c
@@ -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;
}