| Message ID | 20200529100207.GB1304852@mwanda |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: phy: marvell: unlock after phy_select_page() failure | expand |
On Fri, May 29, 2020 at 01:02:07PM +0300, Dan Carpenter wrote: > 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> Andrew
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri, 29 May 2020 13:02:07 +0300 > 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> Applied, thanks.
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;
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> --- drivers/net/phy/marvell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)