|
@@ -854,29 +854,29 @@ static int video_open(struct file *file)
|
|
|
V4L2_FIELD_INTERLACED,
|
|
|
sizeof(struct cx25821_buffer), fh, NULL);
|
|
|
|
|
|
- dprintk(1, "post videobuf_queue_init()\n");
|
|
|
+ dprintk(1, "post videobuf_queue_init()\n");
|
|
|
mutex_unlock(&cx25821_devlist_mutex);
|
|
|
|
|
|
- return 0;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static ssize_t video_read(struct file *file, char __user * data, size_t count,
|
|
|
loff_t *ppos)
|
|
|
{
|
|
|
- struct cx25821_fh *fh = file->private_data;
|
|
|
+ struct cx25821_fh *fh = file->private_data;
|
|
|
|
|
|
- switch (fh->type) {
|
|
|
- case V4L2_BUF_TYPE_VIDEO_CAPTURE:
|
|
|
- if (cx25821_res_locked(fh, RESOURCE_VIDEO0))
|
|
|
- return -EBUSY;
|
|
|
+ switch (fh->type) {
|
|
|
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
|
|
|
+ if (cx25821_res_locked(fh, RESOURCE_VIDEO0))
|
|
|
+ return -EBUSY;
|
|
|
|
|
|
- return videobuf_read_one(&fh->vidq, data, count, ppos,
|
|
|
+ return videobuf_read_one(&fh->vidq, data, count, ppos,
|
|
|
file->f_flags & O_NONBLOCK);
|
|
|
|
|
|
- default:
|
|
|
- BUG();
|
|
|
- return 0;
|
|
|
- }
|
|
|
+ default:
|
|
|
+ BUG();
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static unsigned int video_poll(struct file *file,
|