diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2020-05-29 13:02:07 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-29 12:48:41 -0700 |
| commit | 830f5ce266ce79e18f0026c36c99319b1bc08e1b (patch) | |
| tree | 5b58f18a6b84b8ff04557f46fb13b7ed420e3872 /drivers/net/phy/marvell.c | |
| parent | 2684bda34786b6ae0944a4bacb7f59b5955979a8 (diff) | |
net: phy: marvell: unlock after phy_select_page() failure
We need to call phy_restore_page() even if phy_select_page() fails.
Otherwise we are holding the phy_lock_mdio_bus() lock. This requirement
is documented at the start of the phy_select_page() function.
Fixes: a618e86da91d ("net : phy: marvell: Speedup TDR data retrieval by only changing page once")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/marvell.c')
| -rw-r--r-- | drivers/net/phy/marvell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 2c04e3b2b285..4ea226566cec 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1867,7 +1867,7 @@ static int marvell_vct5_amplitude_graph(struct phy_device *phydev) */ page = phy_select_page(phydev, MII_MARVELL_VCT5_PAGE); if (page < 0) - return page; + goto restore_page; for (distance = priv->first; distance <= priv->last; |