lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 014/153] [media] uvcvideo: Fix a wrong macro
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

    commit 17c341ec0115837a610b2da15e32546e26068234 upstream.

    Don't mix up UVC_BUF_STATE_* and VB2_BUF_STATE_* codes.

    Fixes: 6998b6fb4b1c ("[media] uvcvideo: Use videobuf2-vmalloc")

    Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/usb/uvc/uvc_queue.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/media/usb/uvc/uvc_queue.c
    +++ b/drivers/media/usb/uvc/uvc_queue.c
    @@ -412,7 +412,7 @@ struct uvc_buffer *uvc_queue_next_buffer
    nextbuf = NULL;
    spin_unlock_irqrestore(&queue->irqlock, flags);

    - buf->state = buf->error ? VB2_BUF_STATE_ERROR : UVC_BUF_STATE_DONE;
    + buf->state = buf->error ? UVC_BUF_STATE_ERROR : UVC_BUF_STATE_DONE;
    vb2_set_plane_payload(&buf->buf.vb2_buf, 0, buf->bytesused);
    vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE);


    \
     
     \ /
      Last update: 2017-03-10 12:36    [W:3.456 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site