From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CF3BC2D0C1 for ; Thu, 19 Dec 2019 19:06:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 520EE24672 for ; Thu, 19 Dec 2019 19:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576782390; bh=+YAmTaND9wQX1INLoAIes12pJjrdbmC96OQLhzaGlPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iXsQe8mZuHdm4jN7Hd77mfjGXS5bgxHz+xKARTJnIwALn3JmaRMKaFXUGp/ChoKfj Lu79Rs7c5KozoCVb3skWxqlZnxpZ7da+WLwfYZzMnvv3rn6SPLOVg1tK/Z9Fw+PpEP kqYA120QRf3RPTDtnkIceQ7ju5AhaKyTB9vVCK7Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728999AbfLSSo3 (ORCPT ); Thu, 19 Dec 2019 13:44:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:36482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728216AbfLSSo3 (ORCPT ); Thu, 19 Dec 2019 13:44:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CDB6024672; Thu, 19 Dec 2019 18:44:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781068; bh=+YAmTaND9wQX1INLoAIes12pJjrdbmC96OQLhzaGlPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zQNQjzqtyXb8ykuH6kEzfIFD7mcodjoK9bdJdbUwjQDbTxXChsbpsqXBDhrOQQ8Uz uMFw0J0O5Am/7nF6obcTVmE0QOx3RQrNa9Cmo6r2ksgA2s60NgZSMbRQN0nVdeuuEb vxP/3VEr9+wBCZ/PVxt8FmGkwFPolJnmfLQJRmas= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Pape , Kieran Bingham , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.9 068/199] media: stkwebcam: Bugfix for wrong return values Date: Thu, 19 Dec 2019 19:32:30 +0100 Message-Id: <20191219183218.762617898@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183214.629503389@linuxfoundation.org> References: <20191219183214.629503389@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andreas Pape [ 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 Reviewed-by: Kieran Bingham Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- 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 7297fd261df94..f9844f87467b4 100644 --- a/drivers/media/usb/stkwebcam/stk-webcam.c +++ b/drivers/media/usb/stkwebcam/stk-webcam.c @@ -166,7 +166,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