Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268444
b: refs/heads/master
c: eda59eb
h: refs/heads/master
v: v3
  • Loading branch information
Leonid V. Fedorenchik authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent 24f7c80 commit ed3078e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 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: 3f3d9e4a54d09f2d7f36c274b5e84e15756815a0
refs/heads/master: eda59eb189a387caa64514f4dcfa71af46d8870a
26 changes: 13 additions & 13 deletions trunk/drivers/staging/cx25821/cx25821-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -967,21 +967,21 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)

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

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

res = cx25821_get_resource(fh, RESOURCE_VIDEO0);
err = videobuf_streamoff(get_queue(fh));
if (err < 0)
return err;
cx25821_res_free(dev, fh, res);
return 0;
res = cx25821_get_resource(fh, RESOURCE_VIDEO0);
err = videobuf_streamoff(get_queue(fh));
if (err < 0)
return err;
cx25821_res_free(dev, fh, res);
return 0;
}

static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
Expand Down

0 comments on commit ed3078e

Please sign in to comment.