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.carpen...@oracle.com>
---
 drivers/net/phy/marvell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 2c04e3b2b285f..4ea226566cec9 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;
-- 
2.26.2

Reply via email to