summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsensoray-dev <linux-dev@sensoray.com>2014-11-17 19:50:36 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-21 15:46:25 -0200
commit1f391217ad8d7cd7b1e48e6e2abf49970cd91d18 (patch)
tree9c9a35adbe93ba89f444081f4223193b27164900
parent9661975dded8d39fa320218a6396b8be0972bb2f (diff)
downloadop-kernel-dev-1f391217ad8d7cd7b1e48e6e2abf49970cd91d18.zip
op-kernel-dev-1f391217ad8d7cd7b1e48e6e2abf49970cd91d18.tar.gz
[media] s2255drv: fix payload size for JPG, MJPEG
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>
-rw-r--r--drivers/media/usb/s2255/s2255drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index ccc0009..1c0dbf4 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -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:
OpenPOWER on IntegriCloud