Commit f6f7d9c0 authored by Sean Wang's avatar Sean Wang Committed by David S. Miller

net: ethernet: mediatek: get out of potential invalid pointer access

Potential dangerous invalid pointer might be accessed if
the error happens when couple phy_device to net_device so
cleanup the error path.
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e60b748
...@@ -296,7 +296,9 @@ static int mtk_phy_connect(struct net_device *dev) ...@@ -296,7 +296,9 @@ static int mtk_phy_connect(struct net_device *dev)
regmap_write(eth->ethsys, ETHSYS_SYSCFG0, val); regmap_write(eth->ethsys, ETHSYS_SYSCFG0, val);
/* couple phydev to net_device */ /* couple phydev to net_device */
mtk_phy_connect_node(eth, mac, np); if (mtk_phy_connect_node(eth, mac, np))
goto err_phy;
dev->phydev->autoneg = AUTONEG_ENABLE; dev->phydev->autoneg = AUTONEG_ENABLE;
dev->phydev->speed = 0; dev->phydev->speed = 0;
dev->phydev->duplex = 0; dev->phydev->duplex = 0;
...@@ -317,7 +319,7 @@ static int mtk_phy_connect(struct net_device *dev) ...@@ -317,7 +319,7 @@ static int mtk_phy_connect(struct net_device *dev)
err_phy: err_phy:
of_node_put(np); of_node_put(np);
dev_err(eth->dev, "invalid phy_mode\n"); dev_err(eth->dev, "%s: invalid phy\n", __func__);
return -EINVAL; return -EINVAL;
} }
......
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