|
@@ -244,19 +244,13 @@ static ssize_t dvb_dvr_read(struct file *file, char __user *buf, size_t count,
|
|
|
{
|
|
|
struct dvb_device *dvbdev = file->private_data;
|
|
|
struct dmxdev *dmxdev = dvbdev->priv;
|
|
|
- int ret;
|
|
|
|
|
|
- if (dmxdev->exit) {
|
|
|
- mutex_unlock(&dmxdev->mutex);
|
|
|
+ if (dmxdev->exit)
|
|
|
return -ENODEV;
|
|
|
- }
|
|
|
|
|
|
- //mutex_lock(&dmxdev->mutex);
|
|
|
- ret = dvb_dmxdev_buffer_read(&dmxdev->dvr_buffer,
|
|
|
- file->f_flags & O_NONBLOCK,
|
|
|
- buf, count, ppos);
|
|
|
- //mutex_unlock(&dmxdev->mutex);
|
|
|
- return ret;
|
|
|
+ return dvb_dmxdev_buffer_read(&dmxdev->dvr_buffer,
|
|
|
+ file->f_flags & O_NONBLOCK,
|
|
|
+ buf, count, ppos);
|
|
|
}
|
|
|
|
|
|
static int dvb_dvr_set_buffer_size(struct dmxdev *dmxdev,
|