From aae81a8770d19bdca5bf4ea0e422d8a38d53f68a Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 22 Jun 2012 05:53:31 -0300 Subject: [PATCH] --- yaml --- r: 320141 b: refs/heads/master c: 2e90c6c38a3a5775cccd728eea74fdacbb29e029 h: refs/heads/master i: 320139: 0a37c44477e9b536930b6c6a03910e1d355ce63c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab80a6579a4e..648b9e6539a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2ba5a0b469952328b03e239acacd77858f19fb3 +refs/heads/master: 2e90c6c38a3a5775cccd728eea74fdacbb29e029 diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index f6d7c6e3390e..1e8c4f3ab602 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -767,7 +767,13 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, struct vivi_dev *dev = vb2_get_drv_priv(vq); unsigned long size; - size = dev->width * dev->height * dev->pixelsize; + if (fmt) + size = fmt->fmt.pix.sizeimage; + else + size = dev->width * dev->height * dev->pixelsize; + + if (size == 0) + return -EINVAL; if (0 == *nbuffers) *nbuffers = 32; @@ -1180,6 +1186,8 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = { .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, .vidioc_reqbufs = vb2_ioctl_reqbufs, + .vidioc_create_bufs = vb2_ioctl_create_bufs, + .vidioc_prepare_buf = vb2_ioctl_prepare_buf, .vidioc_querybuf = vb2_ioctl_querybuf, .vidioc_qbuf = vb2_ioctl_qbuf, .vidioc_dqbuf = vb2_ioctl_dqbuf,