diff options
| author | sensoray-dev <linux-dev@sensoray.com> | 2014-11-17 19:50:36 -0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-12-10 17:49:37 +0000 |
| commit | 5d43303e2f872bfb05bd2e8b174d2d23760dab48 (patch) | |
| tree | 07d263ba7b3b4e30c17428288f99a9b945493036 /drivers/media | |
| parent | 3b792fb6f7e6fd010d42830a56decdc0840cd93a (diff) | |
| download | linux-stable-5d43303e2f872bfb05bd2e8b174d2d23760dab48.tar.gz linux-stable-5d43303e2f872bfb05bd2e8b174d2d23760dab48.tar.bz2 linux-stable-5d43303e2f872bfb05bd2e8b174d2d23760dab48.zip | |
[media] s2255drv: fix payload size for JPG, MJPEG
commit 1f391217ad8d7cd7b1e48e6e2abf49970cd91d18 upstream.
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>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/usb/s2255/s2255drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c index a44466bc7b86..ea56159e9bb2 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: |