From a80914e7a1fb695adfd35ee87689981497e03d01 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Tue, 12 Apr 2011 08:15:58 -0300 Subject: [PATCH] --- yaml --- r: 250246 b: refs/heads/master c: f3b1af19647f375efb96cbd0589f9279caea7023 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/fsl-viu.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5bcf6608c073..ed0e44be4c96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 791ae6991051729697dfe60f277744ad6de42316 +refs/heads/master: f3b1af19647f375efb96cbd0589f9279caea7023 diff --git a/trunk/drivers/media/video/fsl-viu.c b/trunk/drivers/media/video/fsl-viu.c index ab0e09d391f1..908d7012c3f2 100644 --- a/trunk/drivers/media/video/fsl-viu.c +++ b/trunk/drivers/media/video/fsl-viu.c @@ -926,12 +926,16 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p) static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i) { struct viu_fh *fh = priv; + struct viu_dev *dev = fh->dev; if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; if (fh->type != i) return -EINVAL; + if (dev->ovenable) + dev->ovenable = 0; + viu_start_dma(fh->dev); return videobuf_streamon(&fh->vb_vidq);