diff options
| author | Brandon Philips <brandon@ifup.org> | 2007-11-19 10:10:48 -0800 |
|---|---|---|
| committer | Brandon Philips <brandon@ifup.org> | 2007-11-19 10:10:48 -0800 |
| commit | 680f1fc5e4ba752162588cfc9d5190d246e3a006 (patch) | |
| tree | 389b5267028950716bbb59bc6951d6b779d54ed9 /linux/drivers/media/common | |
| parent | e33f3357a8412f6941641fd3c40da7305987b03d (diff) | |
| download | mediapointer-dvb-s2-680f1fc5e4ba752162588cfc9d5190d246e3a006.tar.gz mediapointer-dvb-s2-680f1fc5e4ba752162588cfc9d5190d246e3a006.tar.bz2 | |
V4L: Fix VIDIOCGMBUF locking in saa7146
Fallout from videobuf_mmap_setup() locking fixes.
Signed-off-by: Brandon Philips <bphilips@suse.de>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index afb1b9e7d..8066bb9b1 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1206,13 +1206,10 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int DEB_D(("VIDIOCGMBUF \n")); q = &fh->video_q; - mutex_lock(&q->lock); err = videobuf_mmap_setup(q,gbuffers,gbufsize, V4L2_MEMORY_MMAP); - if (err < 0) { - mutex_unlock(&q->lock); + if (err < 0) return err; - } gbuffers = err; memset(mbuf,0,sizeof(*mbuf)); @@ -1220,7 +1217,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int mbuf->size = gbuffers * gbufsize; for (i = 0; i < gbuffers; i++) mbuf->offsets[i] = i * gbufsize; - mutex_unlock(&q->lock); return 0; } #endif |