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=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 8E3CCC2D0C2 for ; Fri, 3 Jan 2020 10:48:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58E4321835 for ; Fri, 3 Jan 2020 10:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578048520; bh=VmuJUYir18nWVLH6eiKToLdOmm43qErS77+sQvzRVVk=; h=Subject:To:From:Date:List-ID:From; b=p7ucJ3uXqqHfZN1YiP6Zj/URoK4lOLK8lFygxCVA1lFhkbg+BzV7evyIBTUz7HOY3 lKLH6hMlAfPrqX49HUD2RHVsylLZdLCTlZ+v4q7SwpS9T/xXJbYW1Mz+77X90eukfo E7cPUU9ghbWOtSHiAiTsaah8zz+3S0p+Mm0CzrHE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727350AbgACKsk (ORCPT ); Fri, 3 Jan 2020 05:48:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:60492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727220AbgACKsj (ORCPT ); Fri, 3 Jan 2020 05:48:39 -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 E4A7F21835; Fri, 3 Jan 2020 10:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578048519; bh=VmuJUYir18nWVLH6eiKToLdOmm43qErS77+sQvzRVVk=; h=Subject:To:From:Date:From; b=O6gWnKejFpUn6l6SvrKoWMiBQIZUz7NNgREffkLb4xHWBXcY2kBUIdGfKPZT/Q42O fSdSNeNkf25RlyZP8KHlXEpGqUDAWW6I47rS8o2Dv4YW1ekyniY5Zr3gnmGs56o+1L Ixxh9C26YclbbPAkTbTeoOgvk876IcBk4cvndEOI= Subject: patch "staging: vt6656: Fix non zero logical return of, usb_control_msg" added to staging-linus To: tvboxspy@gmail.com, gregkh@linuxfoundation.org, stable@vger.kernel.org From: Date: Fri, 03 Jan 2020 11:48:37 +0100 Message-ID: <1578048517122214@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled staging: vt6656: Fix non zero logical return of, usb_control_msg to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 58c3e681b04dd57c70d0dcb7b69fe52d043ff75a Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Fri, 20 Dec 2019 21:14:59 +0000 Subject: staging: vt6656: Fix non zero logical return of, usb_control_msg Starting with commit 59608cb1de1856 ("staging: vt6656: clean function's error path in usbpipe.c") the usb control functions have returned errors throughout driver with only logical variable checking. However, usb_control_msg return the amount of bytes transferred this means that normal operation causes errors. Correct the return function so only return zero when transfer is successful. Cc: stable # v5.3+ Signed-off-by: Malcolm Priestley Link: https://lore.kernel.org/r/08e88842-6f78-a2e3-a7a0-139fec960b2b@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/usbpipe.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index d3304df6bd53..488ebd98773d 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -59,7 +59,9 @@ int vnt_control_out(struct vnt_private *priv, u8 request, u16 value, kfree(usb_buffer); - if (ret >= 0 && ret < (int)length) + if (ret == (int)length) + ret = 0; + else ret = -EIO; end_unlock: @@ -103,7 +105,9 @@ int vnt_control_in(struct vnt_private *priv, u8 request, u16 value, kfree(usb_buffer); - if (ret >= 0 && ret < (int)length) + if (ret == (int)length) + ret = 0; + else ret = -EIO; end_unlock: -- 2.24.1