diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-26 07:54:21 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-26 07:54:21 -0300 |
| commit | ddbf92c7cddd9a8f09ee0dba771cd77ea9d67367 (patch) | |
| tree | 826f9427bf07083e3c8082437fed0ccdc05aacb6 /linux/drivers/media/dvb/cinergyT2 | |
| parent | 8c093da2f9ca5301d886dda4ec36726f09d9e23b (diff) | |
| download | mediapointer-dvb-s2-ddbf92c7cddd9a8f09ee0dba771cd77ea9d67367.tar.gz mediapointer-dvb-s2-ddbf92c7cddd9a8f09ee0dba771cd77ea9d67367.tar.bz2 | |
Cinergyt2: fix file release handler
From: Andrew Morton <akpm@linux-foundation.org>
If this mutex_lock_interruptible() does fail due to signal_pending() then the
state of the driver will get trashed in interesting ways, because userspace
cannot and will not retry the close().
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/cinergyT2')
| -rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index 30dc9e9db..f495251d6 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -552,8 +552,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); |