From ad3be7dfb8d4290324ba1f47eb7c8c9dd811c2fe Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 24 Jun 2012 06:36:49 -0300 Subject: [PATCH] --- yaml --- r: 330697 b: refs/heads/master c: 28c3682ac59dcc551682eceb021b66386ee4e570 h: refs/heads/master i: 330695: 20da1eddd4650257f81393bdd54ba6f362d11dde v: v3 --- [refs] | 2 +- .../drivers/media/video/blackfin/bfin_capture.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d8347965faec..9d0d5b85b4c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f135a8a224294fa0f60ec1b8bc120813b7cfc804 +refs/heads/master: 28c3682ac59dcc551682eceb021b66386ee4e570 diff --git a/trunk/drivers/media/video/blackfin/bfin_capture.c b/trunk/drivers/media/video/blackfin/bfin_capture.c index 0aba45e34f70..1677623d8296 100644 --- a/trunk/drivers/media/video/blackfin/bfin_capture.c +++ b/trunk/drivers/media/video/blackfin/bfin_capture.c @@ -235,8 +235,13 @@ static int bcap_release(struct file *file) static int bcap_mmap(struct file *file, struct vm_area_struct *vma) { struct bcap_device *bcap_dev = video_drvdata(file); + int ret; - return vb2_mmap(&bcap_dev->buffer_queue, vma); + if (mutex_lock_interruptible(&bcap_dev->mutex)) + return -ERESTARTSYS; + ret = vb2_mmap(&bcap_dev->buffer_queue, vma); + mutex_unlock(&bcap_dev->mutex); + return ret; } #ifndef CONFIG_MMU @@ -259,8 +264,12 @@ static unsigned long bcap_get_unmapped_area(struct file *file, static unsigned int bcap_poll(struct file *file, poll_table *wait) { struct bcap_device *bcap_dev = video_drvdata(file); + unsigned int res; - return vb2_poll(&bcap_dev->buffer_queue, file, wait); + mutex_lock(&bcap_dev->mutex); + res = vb2_poll(&bcap_dev->buffer_queue, file, wait); + mutex_unlock(&bcap_dev->mutex); + return res; } static int bcap_queue_setup(struct vb2_queue *vq, @@ -942,10 +951,6 @@ static int __devinit bcap_probe(struct platform_device *pdev) INIT_LIST_HEAD(&bcap_dev->dma_queue); vfd->lock = &bcap_dev->mutex; - /* Locking in file operations other than ioctl should be done - by the driver, not the V4L2 core. - This driver needs auditing so that this flag can be removed. */ - set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags); /* register video device */ ret = video_register_device(bcap_dev->video_dev, VFL_TYPE_GRABBER, -1);