Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1985901imu; Fri, 14 Dec 2018 04:06:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/XwB7yUjxIkDQrEAp9W8svqniC02V8rZ778JGpMzUpZVAJDSvipvBgcjdW3U96F3r+A1bCi X-Received: by 2002:a62:220d:: with SMTP id i13mr2568238pfi.162.1544789184901; Fri, 14 Dec 2018 04:06:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544789184; cv=none; d=google.com; s=arc-20160816; b=Uh1YMk4/mU3405qlDi60ye8vYsExytSl8NC7MVbgd2bnwb+p/a6i/X2PoZpqcQbCms eXQBWquBwOjdvLcLrfz7FtIEgtPCu5scO0PI+vv7Xb3BcVZyT0ux6ArYoqFg5pU9DFln arRywVB7cCtf/3AtNlZlASeWdwtC0UFeIstoXgDO3f0xkAb2NVZITnK4xxsTss088N4n s7qH5CD3gJSQepZYfWPf7uORVSr0S1FmqwM52CizvDaQKD4+gomF4Mxk/Irx+u+1SUNd kuoLr8rMQL97lfV51Mg2IV0nS6NKi6GfZB3M9Uad57MRojiW/yK4LzXzOr5yIuGpywuh y+mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BO0i7QBbKURTWJcJE6ysR/Y9pGoMULpUKW1x8XFnZk0=; b=U1wixk3jlgpVTkTa648HOvt02FuaN50b6ISbAOcHwVHJEvQfkj9Fp7yTZ1SEYU60og uRksNHgRr6BYdXmPBSfpCs9wEc9EH6He7QN1roAP1a0jfK+KZeADIiDduk/cSfwzKxPz k3erohCY5m+n55TZq2muPc996YCSuEivkw/8sTCSXiIM/z6wJseUnv2KycZNUUiXHVZn d6kBLcOtf2OkpexzetJLrAizkbeEdZTeXgLURI38111rVM6ch1KoFd6rYTyhpeU3VSvj /xMQXq5SVGM/9pNtfqJEXD+9mcL3/Y9MHiqyFXt+CcmZMOnnqXq7kB9fDBuTEeXcPqyJ hJOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ht3ONO2i; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j5si4085805pfg.254.2018.12.14.04.06.10; Fri, 14 Dec 2018 04:06:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ht3ONO2i; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730252AbeLNMDK (ORCPT + 99 others); Fri, 14 Dec 2018 07:03:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:46308 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730225AbeLNMDE (ORCPT ); Fri, 14 Dec 2018 07:03:04 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 7EB3E2147C; Fri, 14 Dec 2018 12:03:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544788984; bh=x05QPOkeMbWI+8929MlJ3Qao7/3b6Y/SCZb7YJ9pjSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ht3ONO2ikSbAPsjxv9sJrZ9Dz6hycgPUV3ySk+DgFaTUcNWc4jPz8jvVB2la/ftQX jR7pXVWasokf5FbuNlamjCm/L9ep/UXSQVqh1zalQw9MiBNUk89Ncs4VPS6guriem1 ybYHFM+DlVmHfTCHPzxyhR2NF5iJRzwaYqWSnlMU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Sasha Levin Subject: [PATCH 4.19 026/142] staging: rtl8723bs: Fix the return value in case of error in rtw_wx_read32() Date: Fri, 14 Dec 2018 12:58:31 +0100 Message-Id: <20181214115748.101167160@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214115747.053633987@linuxfoundation.org> References: <20181214115747.053633987@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c3e43d8b958bd6849817393483e805d8638a8ab7 ] We return 0 unconditionally in 'rtw_wx_read32()'. However, 'ret' is set to some error codes in several error handling paths. Return 'ret' instead to propagate the error code. Fixes: 554c0a3abf216 ("staging: Add rtl8723bs sdio wifi driver") Signed-off-by: Christophe JAILLET Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index c38298d960ff..4f120e72c7d2 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -2289,7 +2289,7 @@ static int rtw_wx_read32(struct net_device *dev, exit: kfree(ptmp); - return 0; + return ret; } static int rtw_wx_write32(struct net_device *dev, -- 2.19.1