diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-30 19:59:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-30 19:59:13 -0300 |
| commit | ba0a4fd1311b247e1b3d5954c7412e72240542a1 (patch) | |
| tree | 7338c4cff2cb89d2882ed6ce4863135471fc37b7 /linux/drivers/media/video/em28xx/em28xx-video.c | |
| parent | b6e13ad1e52efcb4693b9260cb0cff0c6e85537f (diff) | |
| download | mediapointer-dvb-s2-ba0a4fd1311b247e1b3d5954c7412e72240542a1.tar.gz mediapointer-dvb-s2-ba0a4fd1311b247e1b3d5954c7412e72240542a1.tar.bz2 | |
em28xx: fix mutex inbalance
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-video.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 7 |
1 files changed, 2 insertions, 5 deletions
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); |