]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] s2255drv: fix payload size for JPG, MJPEG
authorsensoray-dev <linux-dev@sensoray.com>
Mon, 17 Nov 2014 22:50:36 +0000 (19:50 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 21 Nov 2014 17:46:25 +0000 (15:46 -0200)
length is the size of the buffer, not the payload. That's set using
vb2_set_plane_payload().

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Cc: <stable@vger.kernel.org> # for v3.15 and up
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/s2255/s2255drv.c

index ccc00099b26144e4bd1c5b99cbfccbf266a50ad7..1c0dbf428a3af83c4460e51615232fd96a2180ab 100644 (file)
@@ -632,7 +632,7 @@ static void s2255_fillbuff(struct s2255_vc *vc,
                        break;
                case V4L2_PIX_FMT_JPEG:
                case V4L2_PIX_FMT_MJPEG:
-                       buf->vb.v4l2_buf.length = jpgsize;
+                       vb2_set_plane_payload(&buf->vb, 0, jpgsize);
                        memcpy(vbuf, tmpbuf, jpgsize);
                        break;
                case V4L2_PIX_FMT_YUV422P: