From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-eopbgr710090.outbound.protection.outlook.com ([40.107.71.90]:26752 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1733232AbeIXUvq (ORCPT ); Mon, 24 Sep 2018 16:51:46 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Thomas Falcon , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL 4.18 49/76] ibmvnic: Include missing return code checks in reset function Date: Mon, 24 Sep 2018 14:48:31 +0000 Message-ID: <20180924144751.164410-48-alexander.levin@microsoft.com> References: <20180924144751.164410-1-alexander.levin@microsoft.com> In-Reply-To: <20180924144751.164410-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Thomas Falcon [ Upstream commit f611a5b4a51fa36a0aa792be474f5d6aacaef7e3 ] Check the return codes of these functions and halt reset in case of failure. The driver will remain in a dormant state until the next reset event, when device initialization will be re-attempted. Signed-off-by: Thomas Falcon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmvnic.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/= ibmvnic.c index ffe7acbeaa22..d834308adf95 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1841,11 +1841,17 @@ static int do_reset(struct ibmvnic_adapter *adapter= , adapter->map_id =3D 1; release_rx_pools(adapter); release_tx_pools(adapter); - init_rx_pools(netdev); - init_tx_pools(netdev); + rc =3D init_rx_pools(netdev); + if (rc) + return rc; + rc =3D init_tx_pools(netdev); + if (rc) + return rc; =20 release_napi(adapter); - init_napi(adapter); + rc =3D init_napi(adapter); + if (rc) + return rc; } else { rc =3D reset_tx_pools(adapter); if (rc) --=20 2.17.1