Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3775403pxt; Tue, 10 Aug 2021 11:03:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNLNQQn0ADMwC8Vzh+tg2j+8NCyRl6UhdSfdl1ITefC/r2dsBin8rop8oLZ4CrzJw/GmhE X-Received: by 2002:a05:6402:358d:: with SMTP id y13mr6430573edc.300.1628618592327; Tue, 10 Aug 2021 11:03:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618592; cv=none; d=google.com; s=arc-20160816; b=pRxpvG5S/VqNOAnGxi0vjaqGbBKCqzWonkChmWVkWmJwccHuaNqcQluvEzDmluKpUB 7ToHG5tKhAHMTDxn0FHYj7XcMigaAh07WYgaDYU6o1U06eA0vsTIu2F2NuKXeHWToy2E s1HwDz301gpUMo9++DjwsILEw96UdAcz7eGf1LZ+3NNrfMswC88KTdT7351XBAo083Z/ K7T4N9ph3jhuiFhaImZ3JTCh1XVZ8mvKxcICCFr84DKFpLlkjisVspiDGQalJbDnxRHc J1t6Z+aKq+gsER6M+LU3nfZeKkYxKdcct+NrN2jV546L1NQ+MrXBxjR6TH30M6p+KMVr vhTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=meR90uJB4GqKBYTxrkFSOD5pQek6OKbES2NfZf5MFRc=; b=h3j1cgMAmonAe9eKRZtXGpFskh1DXYpksUajBYKprL7Sb8iVtFiKs4hvZmlX3uyF6N 3reyQk+zFsXAydgBVvr9HYJdsd6cDnSWjJJTdezdbQ3hXaFUKHrl24G/InvRKeSp0/Ub i8MR/Z3+SXFith5zGooaHnIVg7unYbnXgLfiNWsnNzion06u76OGSEUkiI65OV5Gkzcb k5RPrwbl/p9KYU8rKeHPfIwDIIEqTPqGohX/01YA2/6DTkY0JSgRuGtI0B+fZYgaz+7k rBdC+eeVmE+N2DqzQ7yDMOF5zclTO0iPeDRH54R2o671YNo/UPjGpJWz3/drbvtjvGBf mq5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=edVKTz4c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p12si20629844ejj.2.2021.08.10.11.02.44; Tue, 10 Aug 2021 11:03:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=edVKTz4c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237506AbhHJSAv (ORCPT + 99 others); Tue, 10 Aug 2021 14:00:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:59726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233512AbhHJR5F (ORCPT ); Tue, 10 Aug 2021 13:57:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CE52060E09; Tue, 10 Aug 2021 17:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617526; bh=D3vvCFp/rZwWniXsWQktlYgr/FRH5Z/L3Rmkokq0q7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=edVKTz4cXx5EFNt2eYBYv1JVhvBaDK5U0MbzYXD2RDeaOeDKl0tn8UXNQfSVkMtg2 tyaxrOVlpsnpaXL5+rysthptGC3oDWtSV/2dCn/3dvqhWYL9NjSnOCdrmFIfWLMatM 7Xk41FmkG6Z8PW0dRFbFqqyMra2r8JhYJCNibPlQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "David S. Miller" , Sasha Levin Subject: [PATCH 5.13 064/175] bnx2x: fix an error code in bnx2x_nic_load() Date: Tue, 10 Aug 2021 19:29:32 +0200 Message-Id: <20210810173003.051113940@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit fb653827c758725b149b5c924a5eb50ab4812750 ] Set the error code if bnx2x_alloc_fw_stats_mem() fails. The current code returns success. Fixes: ad5afc89365e ("bnx2x: Separate VF and PF logic") Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 1a6ec1a12d53..b5d954cb409a 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -2669,7 +2669,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) } /* Allocated memory for FW statistics */ - if (bnx2x_alloc_fw_stats_mem(bp)) + rc = bnx2x_alloc_fw_stats_mem(bp); + if (rc) LOAD_ERROR_EXIT(bp, load_error0); /* request pf to initialize status blocks */ -- 2.30.2