Commit 3fe61f09 authored by Madalin Bucur's avatar Madalin Bucur Committed by David S. Miller

dpaa_eth: cleanup after init_phy() failure

Signed-off-by: default avatarMadalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c030af87
...@@ -2291,7 +2291,8 @@ static int dpaa_open(struct net_device *net_dev) ...@@ -2291,7 +2291,8 @@ static int dpaa_open(struct net_device *net_dev)
net_dev->phydev = mac_dev->init_phy(net_dev, priv->mac_dev); net_dev->phydev = mac_dev->init_phy(net_dev, priv->mac_dev);
if (!net_dev->phydev) { if (!net_dev->phydev) {
netif_err(priv, ifup, net_dev, "init_phy() failed\n"); netif_err(priv, ifup, net_dev, "init_phy() failed\n");
return -ENODEV; err = -ENODEV;
goto phy_init_failed;
} }
for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) { for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
...@@ -2314,6 +2315,7 @@ static int dpaa_open(struct net_device *net_dev) ...@@ -2314,6 +2315,7 @@ static int dpaa_open(struct net_device *net_dev)
for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++)
fman_port_disable(mac_dev->port[i]); fman_port_disable(mac_dev->port[i]);
phy_init_failed:
dpaa_eth_napi_disable(priv); dpaa_eth_napi_disable(priv);
return err; return err;
......
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