lkml.org 
[lkml]   [2019]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 109/267] media: stkwebcam: Bugfix for wrong return values
    Date
    From: Andreas Pape <ap@ca-pape.de>

    [ Upstream commit 3c28b91380dd1183347d32d87d820818031ebecf ]

    usb_control_msg returns in case of a successfully sent message the number
    of sent bytes as a positive number. Don't use this value as a return value
    for stk_camera_read_reg, as a non-zero return value is used as an error
    condition in some cases when stk_camera_read_reg is called.

    Signed-off-by: Andreas Pape <ap@ca-pape.de>
    Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/stkwebcam/stk-webcam.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
    index a7da1356a36ef..6992e84f8a8bb 100644
    --- a/drivers/media/usb/stkwebcam/stk-webcam.c
    +++ b/drivers/media/usb/stkwebcam/stk-webcam.c
    @@ -164,7 +164,11 @@ int stk_camera_read_reg(struct stk_camera *dev, u16 index, u8 *value)
    *value = *buf;

    kfree(buf);
    - return ret;
    +
    + if (ret < 0)
    + return ret;
    + else
    + return 0;
    }

    static int stk_start_stream(struct stk_camera *dev)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-16 19:46    [W:2.688 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site