leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (9910): em28xx: move res_get locks to the caller routines

Browse Source 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2008-12-16 20:19:24 -03:00
parent 7831364f33
commit 29b59417c5
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/media/video/em28xx/em28xx-video.c
View File

@ -599,12 +599,10 @@ static int res_get(struct em28xx_fh *fh)
return rc; return rc;
if (dev->stream_on) if (dev->stream_on)
return -EINVAL; return -EBUSY;
mutex_lock(&dev->lock);
dev->stream_on = 1; dev->stream_on = 1;
fh->stream_on = 1; fh->stream_on = 1;
mutex_unlock(&dev->lock);
return rc; return rc;
} }
@ -1257,8 +1255,12 @@ static int vidioc_streamon(struct file *file, void *priv,
return rc; return rc;
if (unlikely(res_get(fh) < 0)) mutex_lock(&dev->lock);
return -EBUSY; rc = res_get(fh);
mutex_unlock(&dev->lock);
if (unlikely(rc < 0))
return rc;
return (videobuf_streamon(&fh->vb_vidq)); return (videobuf_streamon(&fh->vb_vidq));
} }
@ -1738,8 +1740,12 @@ em28xx_v4l2_read(struct file *filp, char __user *buf, size_t count,
*/ */
if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) { if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
if (unlikely(res_get(fh))) mutex_lock(&dev->lock);
return -EBUSY; rc = res_get(fh);
mutex_unlock(&dev->lock);
if (unlikely(rc < 0))
return rc;
return videobuf_read_stream(&fh->vb_vidq, buf, count, pos, 0, return videobuf_read_stream(&fh->vb_vidq, buf, count, pos, 0,
filp->f_flags & O_NONBLOCK); filp->f_flags & O_NONBLOCK);
@ -1761,7 +1767,11 @@ static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table * wait)
if (rc < 0) if (rc < 0)
return rc; return rc;
if (unlikely(res_get(fh) < 0)) mutex_lock(&dev->lock);
rc = res_get(fh);
mutex_unlock(&dev->lock);
if (unlikely(rc < 0))
return POLLERR; return POLLERR;
if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type) if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
@ -1779,13 +1789,17 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
struct em28xx *dev = fh->dev; struct em28xx *dev = fh->dev;
int rc; int rc;
if (unlikely(res_get(fh) < 0))
return -EBUSY;
rc = check_dev(dev); rc = check_dev(dev);
if (rc < 0) if (rc < 0)
return rc; return rc;
mutex_lock(&dev->lock);
rc = res_get(fh);
mutex_unlock(&dev->lock);
if (unlikely(rc < 0))
return rc;
rc = videobuf_mmap_mapper(&fh->vb_vidq, vma); rc = videobuf_mmap_mapper(&fh->vb_vidq, vma);
em28xx_videodbg("vma start=0x%08lx, size=%ld, ret=%d\n", em28xx_videodbg("vma start=0x%08lx, size=%ld, ret=%d\n",