lkml.org 
[lkml]   [2014]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 130/168] [media] s2255drv: fix payload size for JPG, MJPEG
    Date
    3.16.7-ckt3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: sensoray-dev <linux-dev@sensoray.com>

    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>
    ---
    drivers/media/usb/s2255/s2255drv.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    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:
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-12-15 16:01    [W:5.011 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site