Commit 89df20d9 authored by Hans de Goede's avatar Hans de Goede Committed by David S. Miller

stmmac: Remove unbalanced clk_disable call

The stmmac_open call was calling clk_disable_unprepare on phy init
failure, but it never calls clk_prepare_enable, this causes
a WARN_ON in the clk framework to trigger if for some reason phy init
fails.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4de462ab
...@@ -1704,7 +1704,7 @@ static int stmmac_open(struct net_device *dev) ...@@ -1704,7 +1704,7 @@ static int stmmac_open(struct net_device *dev)
if (ret) { if (ret) {
pr_err("%s: Cannot attach to PHY (error: %d)\n", pr_err("%s: Cannot attach to PHY (error: %d)\n",
__func__, ret); __func__, ret);
goto phy_error; return ret;
} }
} }
...@@ -1779,8 +1779,6 @@ static int stmmac_open(struct net_device *dev) ...@@ -1779,8 +1779,6 @@ static int stmmac_open(struct net_device *dev)
dma_desc_error: dma_desc_error:
if (priv->phydev) if (priv->phydev)
phy_disconnect(priv->phydev); phy_disconnect(priv->phydev);
phy_error:
clk_disable_unprepare(priv->stmmac_clk);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment