From 3c28b91380dd1183347d32d87d820818031ebecf Mon Sep 17 00:00:00 2001

From: Andreas Pape <ap@ca-pape.de>

Date: Fri, 23 Nov 2018 11:14:54 -0500

Subject: [PATCH] media: stkwebcam: Bugfix for wrong return values

Git-commit: 3c28b91380dd1183347d32d87d820818031ebecf

Patch-mainline: v5.0-rc1

References: bsc#1051510

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>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 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 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)

-- 

2.16.4