Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118705
b: refs/heads/master
c: b058e3f
h: refs/heads/master
i:
  118703: fd92e96
v: v3
  • Loading branch information
Rafael Diniz authored and Mauro Carvalho Chehab committed Nov 11, 2008
1 parent a6d47ce commit 3619da3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 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: e8deeae24f8b55a7203bec9b056593d9c62fae68
refs/heads/master: b058e3f39508a3876a4fbf4a92398c817cf82809
10 changes: 8 additions & 2 deletions trunk/drivers/media/video/cx88/cx88-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1216,8 +1216,12 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
struct cx8800_fh *fh = priv;
struct cx8800_dev *dev = fh->dev;

if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
/* We should remember that this driver also supports teletext, */
/* so we have to test if the v4l2_buf_type is VBI capture data. */
if (unlikely((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
(fh->type != V4L2_BUF_TYPE_VBI_CAPTURE)))
return -EINVAL;

if (unlikely(i != fh->type))
return -EINVAL;

Expand All @@ -1232,8 +1236,10 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
struct cx8800_dev *dev = fh->dev;
int err, res;

if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
(fh->type != V4L2_BUF_TYPE_VBI_CAPTURE))
return -EINVAL;

if (i != fh->type)
return -EINVAL;

Expand Down

0 comments on commit 3619da3

Please sign in to comment.