]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] media: saa7146: don't use mutex_lock_interruptible() in device_release()
authorCyril Roelandt <tipecaml@gmail.com>
Tue, 11 Dec 2012 02:05:28 +0000 (23:05 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 27 Dec 2012 19:34:28 +0000 (17:34 -0200)
Use uninterruptible mutex_lock in the release() file op to make sure all
resources are properly freed when a process is being terminated. Returning
-ERESTARTSYS has no effect for a terminating process and this may cause driver
resources not to be released.
This was found using the following semantic patch (http://coccinelle.lip6.fr/):
<spml>
@r@
identifier fops;
identifier release_func;
@@
static const struct v4l2_file_operations fops = {
.release = release_func
};
@depends on r@
identifier r.release_func;
expression E;
@@
static int release_func(...)
{
...
- if (mutex_lock_interruptible(E)) return -ERESTARTSYS;
+ mutex_lock(E);
...
}
</spml>

Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/saa7146/saa7146_fops.c

index 2652f9155c347a0e9ac2e83f82933c5ddfe40f7b..eda01bc68ab200272f9c4b247302f407d5ae13f4 100644 (file)
@@ -265,8 +265,7 @@ static int fops_release(struct file *file)
 
        DEB_EE("file:%p\n", file);
 
-       if (mutex_lock_interruptible(vdev->lock))
-               return -ERESTARTSYS;
+       mutex_lock(vdev->lock);
 
        if (vdev->vfl_type == VFL_TYPE_VBI) {
                if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)