Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752159AbcL1Xoy (ORCPT ); Wed, 28 Dec 2016 18:44:54 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35570 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890AbcL1Xox (ORCPT ); Wed, 28 Dec 2016 18:44:53 -0500 From: Florian Fainelli 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, boon.leong.ong@intel.com, weifeng.voon@intel.com, 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 Date: Wed, 28 Dec 2016 15:44:41 -0800 Message-Id: <20161228234441.5026-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1321 Lines: 38 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 --- 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