Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752779AbcL2Jip convert rfc822-to-8bit (ORCPT ); Thu, 29 Dec 2016 04:38:45 -0500 Received: from mga04.intel.com ([192.55.52.120]:29182 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752723AbcL2Jin (ORCPT ); Thu, 29 Dec 2016 04:38:43 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,426,1477983600"; d="scan'208";a="24000527" From: "Kweh, Hock Leong" To: Florian Fainelli , David Miller CC: "Joao.Pinto@synopsys.com" , "peppe.cavallaro@st.com" , "seraphin.bonnaffe@st.com" , "alexandre.torgue@gmail.com" , "manabian@gmail.com" , "niklas.cassel@axis.com" , "johan@kernel.org" , "pavel@ucw.cz" , "Ong, Boon Leong" , "Voon, Weifeng" , "lars.persson@axis.com" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Giuseppe Cavallaro , Alexandre Torgue Subject: RE: [PATCH net] net: stmmac: Fix error path after register_netdev move Thread-Topic: [PATCH net] net: stmmac: Fix error path after register_netdev move Thread-Index: AQHSYWRoyZeubMu2QJew/2fUb7yjTqEejoMggAAa+mA= Date: Thu, 29 Dec 2016 09:36:57 +0000 Message-ID: References: <20161228234441.5026-1-f.fainelli@gmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.30.20.205] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2134 Lines: 58 > -----Original Message----- > From: Florian Fainelli [mailto:f.fainelli@gmail.com] > Sent: Thursday, December 29, 2016 7:45 AM > To: netdev@vger.kernel.org > Cc: Florian Fainelli ; pavel@ucw.cz; > Joao.Pinto@synopsys.com; seraphin.bonnaffe@st.com; > alexandre.torgue@gmail.com; manabian@gmail.com; niklas.cassel@axis.com; > johan@kernel.org; Ong, Boon Leong ; Voon, > Weifeng ; lars.persson@axis.com; linux- > kernel@vger.kernel.org; Giuseppe Cavallaro ; > Alexandre Torgue > Subject: [PATCH net] net: stmmac: Fix error path after register_netdev move > > Commit 5701659004d6 ("net: stmmac: Fix race between stmmac_drv_probe and > stmmac_open") re-ordered how the MDIO bus registration and the network > device are registered, but missed to unwind the MDIO bus registration in case > we fail to register the network device. > > Fixes: 5701659004d6 ("net: stmmac: Fix race between stmmac_drv_probe and > stmmac_open") > Signed-off-by: Florian Fainelli > --- Acked-by: Kweh, Hock Leong > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 5910ea51f8f6..39eb7a65bb9f 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -3366,12 +3366,19 @@ int stmmac_dvr_probe(struct device *device, > } > > ret = register_netdev(ndev); > - if (ret) > + if (ret) { > netdev_err(priv->dev, "%s: ERROR %i registering the device\n", > __func__, ret); > + goto error_netdev_register; > + } > > return ret; > > +error_netdev_register: > + if (priv->hw->pcs != STMMAC_PCS_RGMII && > + priv->hw->pcs != STMMAC_PCS_TBI && > + priv->hw->pcs != STMMAC_PCS_RTBI) > + stmmac_mdio_unregister(ndev); > error_mdio_register: > netif_napi_del(&priv->napi); > error_hw_init: > -- > 2.9.3