xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: ag71xx: call phylink_disconnect_phy if ag71xx_hw_enable() fail in ag71xx_open()

Browse Source 
[ Upstream commit c9b895c6878bdb6789dc1d7af60fd10f4a9f1937 ]

If ag71xx_hw_enable() fails, call phylink_disconnect_phy() to clean up.
And if phylink_of_phy_connect() fails, nothing needs to be done.
Compile tested only.

Fixes: 892e09153f ("net: ag71xx: port to phylink")
Signed-off-by: Liu Jian <liujian56@huawei.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/20221114095549.40342-1-liujian56@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Liu Jian
2022-11-14 17:55:49 +08:00
committed by Greg Kroah-Hartman
parent 3aeb13bc3d
commit 94822d2331
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/atheros/ag71xx.c
View File

@@ -1468,7 +1468,7 @@ static int ag71xx_open(struct net_device *ndev)
if (ret) { if (ret) {
netif_err(ag, link, ndev, "phylink_of_phy_connect filed with err: %i\n", netif_err(ag, link, ndev, "phylink_of_phy_connect filed with err: %i\n",
ret); ret);
goto err; return ret;
} }
max_frame_len = ag71xx_max_frame_len(ndev->mtu); max_frame_len = ag71xx_max_frame_len(ndev->mtu);
@@ -1489,6 +1489,7 @@ static int ag71xx_open(struct net_device *ndev)
err: err:
ag71xx_rings_cleanup(ag); ag71xx_rings_cleanup(ag);
phylink_disconnect_phy(ag->phylink);
return ret; return ret;
} }