Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268443
b: refs/heads/master
c: 3f3d9e4
h: refs/heads/master
i:
  268441: ca826b5
  268439: e892290
v: v3
  • Loading branch information
Leonid V. Fedorenchik authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent faf2f63 commit 24f7c80
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 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: 21377cdd5e34b135d62bda5d974f052adf873341
refs/heads/master: 3f3d9e4a54d09f2d7f36c274b5e84e15756815a0
20 changes: 10 additions & 10 deletions trunk/drivers/staging/cx25821/cx25821-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -949,20 +949,20 @@ static int video_release(struct file *file)

static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
{
struct cx25821_fh *fh = priv;
struct cx25821_dev *dev = fh->dev;
struct cx25821_fh *fh = priv;
struct cx25821_dev *dev = fh->dev;

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

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

if (unlikely(!cx25821_res_get(dev, fh,
cx25821_get_resource(fh, RESOURCE_VIDEO0))))
return -EBUSY;
if (unlikely(!cx25821_res_get(dev, fh, cx25821_get_resource(fh,
RESOURCE_VIDEO0))))
return -EBUSY;

return videobuf_streamon(get_queue(fh));
return videobuf_streamon(get_queue(fh));
}

static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
Expand Down

0 comments on commit 24f7c80

Please sign in to comment.