diff options
| author | Liu Jian <liujian56@huawei.com> | 2022-11-14 17:55:49 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-11-15 20:22:12 -0800 |
| commit | c9b895c6878bdb6789dc1d7af60fd10f4a9f1937 (patch) | |
| tree | f2f5cd9705a57c6fedaa38cfc07b20ad7cbc12d8 | |
| parent | 9d45921ee4cb364910097e7d1b7558559c2f9fd2 (diff) | |
| download | linux-trace-c9b895c6878bdb6789dc1d7af60fd10f4a9f1937.tar.gz | |
net: ag71xx: call phylink_disconnect_phy if ag71xx_hw_enable() fail in ag71xx_open()
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: 892e09153fa3 ("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>
| -rw-r--r-- | drivers/net/ethernet/atheros/ag71xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c index cc932b3cf873ac..4a1efe9b37d02a 100644 --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c @@ -1427,7 +1427,7 @@ static int ag71xx_open(struct net_device *ndev) if (ret) { netif_err(ag, link, ndev, "phylink_of_phy_connect filed with err: %i\n", ret); - goto err; + return ret; } max_frame_len = ag71xx_max_frame_len(ndev->mtu); @@ -1448,6 +1448,7 @@ static int ag71xx_open(struct net_device *ndev) err: ag71xx_rings_cleanup(ag); + phylink_disconnect_phy(ag->phylink); return ret; } |