summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorAndreas Pape <ap@ca-pape.de>2018-11-23 19:14:54 +0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-12-05 22:10:48 +0300
commit3c28b91380dd1183347d32d87d820818031ebecf (patch)
treec2f58f5ae0597e5965ae5c60ebddd116808454c9 /drivers/media
parent2bf47eefca6de0547e866c05935c592ed7ea06f6 (diff)
downloadlinux-3c28b91380dd1183347d32d87d820818031ebecf.tar.xz
media: stkwebcam: Bugfix for wrong return values
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/stkwebcam/stk-webcam.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index e61427e50525..b8ec74d98e8d 100644
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -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)