From 24f7c80a1c9a02f35f13209e349e490e0743460f Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Fri, 16 Sep 2011 14:14:52 +0800 Subject: [PATCH] --- yaml --- r: 268443 b: refs/heads/master c: 3f3d9e4a54d09f2d7f36c274b5e84e15756815a0 h: refs/heads/master i: 268441: ca826b5ed72fae6e02361beaf75c0c5076f020f8 268439: e892290ac64c4492c447e10f26248d4283501302 v: v3 --- [refs] | 2 +- trunk/drivers/staging/cx25821/cx25821-video.c | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 88ae76dfaa4d..5f76f94055e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21377cdd5e34b135d62bda5d974f052adf873341 +refs/heads/master: 3f3d9e4a54d09f2d7f36c274b5e84e15756815a0 diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c index 75bc44e25486..83872c801c73 100644 --- a/trunk/drivers/staging/cx25821/cx25821-video.c +++ b/trunk/drivers/staging/cx25821/cx25821-video.c @@ -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)