aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-16 20:00:49 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 09:39:13 -0200
commit7831364f33af9bb7333f333e9a239b1dd2edea1c (patch)
treea699ba31bca6f697fbdc35f31ba60a5098085c8d
parent7d4f0b8153608fbfdae26887512fa1fb5229cde9 (diff)
V4L/DVB (9909): em28xx: move dev->lock from res_free to the caller routines
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 6e558d2ca0f..90aedaeb09b 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -617,10 +617,8 @@ static void res_free(struct em28xx_fh *fh)
{
struct em28xx *dev = fh->dev;
- mutex_lock(&dev->lock);
fh->stream_on = 0;
dev->stream_on = 0;
- mutex_unlock(&dev->lock);
}
/*
@@ -1282,7 +1280,9 @@ static int vidioc_streamoff(struct file *file, void *priv,
return -EINVAL;
videobuf_streamoff(&fh->vb_vidq);
+ mutex_lock(&dev->lock);
res_free(fh);
+ mutex_unlock(&dev->lock);
return 0;
}
@@ -1677,11 +1677,10 @@ static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
em28xx_videodbg("users=%d\n", dev->users);
+ mutex_lock(&dev->lock);
if (res_check(fh))
res_free(fh);
- mutex_lock(&dev->lock);
-
if (dev->users == 1) {
videobuf_stop(&fh->vb_vidq);
videobuf_mmap_free(&fh->vb_vidq);