media: stkwebcam: Bugfix for wrong return values
authorAndreas Pape <ap@ca-pape.de>
Fri, 23 Nov 2018 16:14:54 +0000 (11:14 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 5 Dec 2018 19:10:48 +0000 (14:10 -0500)
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>
drivers/media/usb/stkwebcam/stk-webcam.c

index e61427e..b8ec74d 100644 (file)
@@ -171,7 +171,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)