summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/s2255
diff options
context:
space:
mode:
authorsensoray-dev <linux-dev@sensoray.com>2014-11-17 23:50:36 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-21 18:46:25 +0100
commit1f391217ad8d7cd7b1e48e6e2abf49970cd91d18 (patch)
tree9c9a35adbe93ba89f444081f4223193b27164900 /drivers/media/usb/s2255
parent[media] Update MAINTAINERS for solo6x10 (diff)
downloadlinux-1f391217ad8d7cd7b1e48e6e2abf49970cd91d18.tar.xz
linux-1f391217ad8d7cd7b1e48e6e2abf49970cd91d18.zip
[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>
Diffstat (limited to 'drivers/media/usb/s2255')
-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 ccc00099b261..1c0dbf428a3a 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: