diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-13 13:49:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-13 13:49:04 -0300 |
| commit | a73981e95b53d62cc7e42ce54e54473f3758d2e7 (patch) | |
| tree | 94a39a23ddd291bb3ba1897bf72e69a532cff60e /linux/drivers/media/dvb/dvb-core/dmxdev.c | |
| parent | ed98e2514b5928698127958acf047de216986cb9 (diff) | |
| parent | 619f7ef871542e60ea54401cb52dda1b6679cfb9 (diff) | |
| download | mediapointer-dvb-s2-a73981e95b53d62cc7e42ce54e54473f3758d2e7.tar.gz mediapointer-dvb-s2-a73981e95b53d62cc7e42ce54e54473f3758d2e7.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/m920x
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dmxdev.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dmxdev.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c index fc77de45c..a5c0e1a3e 100644 --- a/linux/drivers/media/dvb/dvb-core/dmxdev.c +++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c @@ -180,8 +180,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct dmxdev *dmxdev = dvbdev->priv; - if (mutex_lock_interruptible(&dmxdev->mutex)) - return -ERESTARTSYS; + mutex_lock(&dmxdev->mutex); if ((file->f_flags & O_ACCMODE) == O_WRONLY) { dmxdev->demux->disconnect_frontend(dmxdev->demux); @@ -673,13 +672,8 @@ static int dvb_demux_open(struct inode *inode, struct file *file) static int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *dmxdevfilter) { - if (mutex_lock_interruptible(&dmxdev->mutex)) - return -ERESTARTSYS; - - if (mutex_lock_interruptible(&dmxdevfilter->mutex)) { - mutex_unlock(&dmxdev->mutex); - return -ERESTARTSYS; - } + mutex_lock(&dmxdev->mutex); + mutex_lock(&dmxdevfilter->mutex); dvb_dmxdev_filter_stop(dmxdevfilter); dvb_dmxdev_filter_reset(dmxdevfilter); |