[media] cx23885: ensure video is streaming before allowing vbi to stream

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth 2011-10-10 11:09:54 -03:00 committed by Mauro Carvalho Chehab
parent af76e9f625
commit 24465b4485

View File

@ -1100,6 +1100,14 @@ static int vidioc_streamon(struct file *file, void *priv,
if (unlikely(!res_get(dev, fh, get_resource(fh))))
return -EBUSY;
/* Don't start VBI streaming unless vida streaming
* has already started.
*/
if ((fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) &&
((cx_read(VID_A_DMA_CTL) & 0x11) == 0))
return -EINVAL;
return videobuf_streamon(get_queue(fh));
}