From b17c0d0898eb898b763b7a482ecfad67d37820ee Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 26 May 2007 07:54:21 -0300 Subject: [PATCH] --- yaml --- r: 57535 b: refs/heads/master c: ffeb9ec72e18e16d0b0835d959cdf01650758638 h: refs/heads/master i: 57533: 0e7e320ae5b31db2e7423267a1f17ba1cba45e50 57531: 6b4be4fd5a0c75d4d7409575c70cadf9a129400e 57527: 0089895523e5aa060a81281c71e9ad68121f5ce9 57519: 3056145e2fc053ded0406ce2f624c364904a24b0 57503: 4e800dc12781ea6860d3e1f6e0be9c98d55c4fd8 57471: e52d192fd95f1602bf5b6b5d72b516f65a15f6a4 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4d67b718ddb6..cc7806f2d93a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 624fc7f52b48f69fd9d1fe7a594c211762c89825 +refs/heads/master: ffeb9ec72e18e16d0b0835d959cdf01650758638 diff --git a/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c b/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c index 34d7abc900d7..6aba5b39ed14 100644 --- a/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -519,8 +519,7 @@ static int cinergyt2_release (struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct cinergyt2 *cinergyt2 = dvbdev->priv; - if (mutex_lock_interruptible(&cinergyt2->sem)) - return -ERESTARTSYS; + mutex_lock(&cinergyt2->sem); if (!cinergyt2->disconnect_pending && (file->f_flags & O_ACCMODE) != O_RDONLY) { cancel_delayed_work(&cinergyt2->query_work);