From fedc45ac6811fe43c0fe93f8caa29591e39dad95 Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Fri, 16 Sep 2011 14:14:49 +0800 Subject: [PATCH] --- yaml --- r: 268440 b: refs/heads/master c: 20e8a366c0a04ff4c12465e9eb0d38b7a0e4efb4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/cx25821/cx25821-video.c | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index dc4a6bf446d2..06324683b0ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bf42c9e4f45b8ec8699d903d3509343de6fe1ca +refs/heads/master: 20e8a366c0a04ff4c12465e9eb0d38b7a0e4efb4 diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c index db9b765bf1e5..3af5f2bfaa8a 100644 --- a/trunk/drivers/staging/cx25821/cx25821-video.c +++ b/trunk/drivers/staging/cx25821/cx25821-video.c @@ -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,