From ba0a4fd1311b247e1b3d5954c7412e72240542a1 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 30 Jul 2009 19:59:13 -0300 Subject: em28xx: fix mutex inbalance From: Mauro Carvalho Chehab Priority: normal Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/em28xx/em28xx-video.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 8cb8674c9..fcb99fb71 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -1136,15 +1136,12 @@ static int vidioc_s_ctrl(struct file *file, void *priv, switch (ctrl->id) { case V4L2_CID_AUDIO_MUTE: dev->mute = ctrl->value; - return em28xx_audio_analog_set(dev); + rc = em28xx_audio_analog_set(dev); break; case V4L2_CID_AUDIO_VOLUME: dev->volume = ctrl->value; - return em28xx_audio_analog_set(dev); + rc = em28xx_audio_analog_set(dev); } - - /* FIXME: should be returning a meaninful value */ - rc = 0; } mutex_unlock(&dev->lock); -- cgit v1.2.3