From 2a4906377d4ddab06390e1d92c00fd8eca7e3d9c Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Mon, 10 Dec 2012 23:05:28 -0300 Subject: [PATCH] --- yaml --- r: 357193 b: refs/heads/master c: 21a73397c0cea688a37c532d1029fc8ecbd88fc6 h: refs/heads/master i: 357191: 1af77f5a7ff19d9dd31c8388d51d44999c744ac5 v: v3 --- [refs] | 2 +- trunk/drivers/media/common/saa7146/saa7146_fops.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4090de9f91e0..afb1575bbfba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d7005f9875460021f28df90783771875b694a32 +refs/heads/master: 21a73397c0cea688a37c532d1029fc8ecbd88fc6 diff --git a/trunk/drivers/media/common/saa7146/saa7146_fops.c b/trunk/drivers/media/common/saa7146/saa7146_fops.c index 2652f9155c34..eda01bc68ab2 100644 --- a/trunk/drivers/media/common/saa7146/saa7146_fops.c +++ b/trunk/drivers/media/common/saa7146/saa7146_fops.c @@ -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)