From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756092AbbGPTS4 (ORCPT ); Thu, 16 Jul 2015 15:18:56 -0400 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:4007 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752842AbbGPTSy (ORCPT ); Thu, 16 Jul 2015 15:18:54 -0400 X-IronPort-AV: E=Sophos;i="5.15,489,1432623600"; d="scan'208";a="70150230" Subject: Re: [PATCH] tg3:Add error handling to the function tg3_test_loopback From: Michael Chan To: Nicholas Krause CC: , , In-Reply-To: <1437072690-21048-1-git-send-email-xerofoify@gmail.com> References: <1437072690-21048-1-git-send-email-xerofoify@gmail.com> Content-Type: text/plain; charset="cp1252" Date: Thu, 16 Jul 2015 12:18:52 -0700 Message-ID: <1437074332.3152.0.camel@LTIRV-MCHAN1.corp.ad.broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2015-07-16 at 14:51 -0400, Nicholas Krause wrote: > This adds proper error handling for if the calls to the function > tg3_phy_lpbk_set fail by returning -EIO by assigning the return > value to the variable err and if it equals anything other then > zero jumps to the goto label done as no other work can be handled > internally in the function tg3_test_loopback. > > Signed-off-by: Nicholas Krause Acked-by: Michael Chan > --- > drivers/net/ethernet/broadcom/tg3.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c > index 73c934c..8584cb7 100644 > --- a/drivers/net/ethernet/broadcom/tg3.c > +++ b/drivers/net/ethernet/broadcom/tg3.c > @@ -13625,8 +13625,10 @@ static int tg3_test_loopback(struct tg3 *tp, u64 *data, bool do_extlpbk) > !tg3_flag(tp, USE_PHYLIB)) { > int i; > > - tg3_phy_lpbk_set(tp, 0, false); > - > + err = tg3_phy_lpbk_set(tp, 0, false); > + if (err) > + goto done; > + > /* Wait for link */ > for (i = 0; i < 100; i++) { > if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP) > @@ -13644,8 +13646,10 @@ static int tg3_test_loopback(struct tg3 *tp, u64 *data, bool do_extlpbk) > data[TG3_PHY_LOOPB_TEST] |= TG3_JMB_LOOPBACK_FAILED; > > if (do_extlpbk) { > - tg3_phy_lpbk_set(tp, 0, true); > - > + err = tg3_phy_lpbk_set(tp, 0, true); > + > + if (err) > + goto done; > /* All link indications report up, but the hardware > * isn't really ready for about 20 msec. Double it > * to be sure.