Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268440
b: refs/heads/master
c: 20e8a36
h: refs/heads/master
v: v3
  • Loading branch information
Leonid V. Fedorenchik authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent e892290 commit fedc45a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0bf42c9e4f45b8ec8699d903d3509343de6fe1ca
refs/heads/master: 20e8a366c0a04ff4c12465e9eb0d38b7a0e4efb4
24 changes: 12 additions & 12 deletions trunk/drivers/staging/cx25821/cx25821-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit fedc45a

Please sign in to comment.