From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6759CA0573; Thu, 5 Mar 2020 11:38:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7FD1D1BE7D; Thu, 5 Mar 2020 11:38:44 +0100 (CET) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 471BA2BE3; Thu, 5 Mar 2020 11:38:43 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us2.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 28674280066; Thu, 5 Mar 2020 10:38:42 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 5 Mar 2020 10:38:38 +0000 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 5 Mar 2020 10:38:38 +0000 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 025Acc4h002457; Thu, 5 Mar 2020 10:38:38 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id CB08B1611DB; Thu, 5 Mar 2020 10:38:38 +0000 (GMT) From: Andrew Rybchenko To: CC: Igor Romanov , Date: Thu, 5 Mar 2020 10:38:36 +0000 Message-ID: <1583404716-30706-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1020-25270.003 X-TM-AS-Result: No-0.497500-8.000000-10 X-TMASE-MatchedRID: i01+YSiNUzM4MobgUdzh7bsHVDDM5xAPUXlp1FHYSPVjLp8Cm8vwF1Me 5Blkpry7rdoLblq9S5oipDrvIJMjbtLucdA1OHpBngIgpj8eDcBpkajQR5gb3savT21DsLD/UEh Wy9W70AEnRE+fI6etkjLrUEPaodiAv4Y8jp9txYtt9vhMenGCtsvcMD5srL6X8EucfwqgPyW5gT cR940Fm8BBai+QMMo75JZlUsvGpj48CEJfSFNg571NuKS30BZnQIFIZLtsgG0DUH+nVLNyiCsqI P9TxvtJMb6p570ilnc= X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--0.497500-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1020-25270.003 X-MDID: 1583404722-Ou5KQFBYYh7v Subject: [dpdk-dev] [PATCH] net/sfc: fix incorrect fail label placement X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Igor Romanov NIC deinitialization should not happen after a failed NIC initialization. Fixes: 91831d4068c8 ("net/sfc: estimate available resources") Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index c6b514ac2..3f5cd7758 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -241,8 +241,8 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa) return 0; fail_get_vi_pool: -fail_nic_init: efx_nic_fini(sa->nic); +fail_nic_init: return rc; } -- 2.17.1