diff options
| author | Anatolij Gustschin <agust@denx.de> | 2011-04-12 13:15:58 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 14:29:59 +0200 |
| commit | f3b1af19647f375efb96cbd0589f9279caea7023 (patch) | |
| tree | e6197cb097326a94a4b516bb1a1bd0a2d798ec7c /drivers/media/video/fsl-viu.c | |
| parent | [media] fsl_viu: add VIDIOC_OVERLAY ioctl (diff) | |
| download | linux-f3b1af19647f375efb96cbd0589f9279caea7023.tar.xz linux-f3b1af19647f375efb96cbd0589f9279caea7023.zip | |
[media] media: fsl_viu: fix bug in streamon routine
Currently video capturing using streaming I/O method
doesn't work if capturing to overlay buffer took place
before.
When enabling the stream we have to check the overlay
enable driver flag and reset it so that the interrupt
handler won't execute the overlay interrupt path after
enabling DMA in streamon routine. Otherwise the capture
interrupt won't be handled correctly causing non working
VIDIOC_DQBUF ioctl.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/fsl-viu.c')
| -rw-r--r-- | drivers/media/video/fsl-viu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/fsl-viu.c b/drivers/media/video/fsl-viu.c index ab0e09d391f1..908d7012c3f2 100644 --- a/drivers/media/video/fsl-viu.c +++ b/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); |