mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
net: phy: icplus: call phy_restore_page() when phy_select_page() fails
The comments to phy_select_page() say that "phy_restore_page() must always be called after this, irrespective of success or failure of this call." If we don't call phy_restore_page() then we are still holding the phy_lock_mdio_bus() so it eventually leads to a dead lock. Fixes:32ab60e539
("net: phy: icplus: add MDI/MDIX support for IP101A/G") Fixes:f9bc51e6cc
("net: phy: icplus: fix paged register access") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Michael Walle <michael@walle.cc> Reviewed-by: Russell King <rmk+kernel@armlinux.org.uk> Link: https://lore.kernel.org/r/YC+OpFGsDPXPnXM5@mwanda Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
0a8a800027
commit
4e9d9d1f48
1 changed files with 5 additions and 4 deletions
|
@ -239,7 +239,7 @@ static int ip101a_g_config_intr_pin(struct phy_device *phydev)
|
|||
|
||||
oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE);
|
||||
if (oldpage < 0)
|
||||
return oldpage;
|
||||
goto out;
|
||||
|
||||
/* configure the RXER/INTR_32 pin of the 32-pin IP101GR if needed: */
|
||||
switch (priv->sel_intr32) {
|
||||
|
@ -314,7 +314,7 @@ static int ip101a_g_read_status(struct phy_device *phydev)
|
|||
|
||||
oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE);
|
||||
if (oldpage < 0)
|
||||
return oldpage;
|
||||
goto out;
|
||||
|
||||
ret = __phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);
|
||||
if (ret < 0)
|
||||
|
@ -349,7 +349,8 @@ static int ip101a_g_read_status(struct phy_device *phydev)
|
|||
static int ip101a_g_config_mdix(struct phy_device *phydev)
|
||||
{
|
||||
u16 ctrl = 0, ctrl2 = 0;
|
||||
int oldpage, ret;
|
||||
int oldpage;
|
||||
int ret = 0;
|
||||
|
||||
switch (phydev->mdix_ctrl) {
|
||||
case ETH_TP_MDI:
|
||||
|
@ -367,7 +368,7 @@ static int ip101a_g_config_mdix(struct phy_device *phydev)
|
|||
|
||||
oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE);
|
||||
if (oldpage < 0)
|
||||
return oldpage;
|
||||
goto out;
|
||||
|
||||
ret = __phy_modify(phydev, IP10XX_SPEC_CTRL_STATUS,
|
||||
IP101A_G_AUTO_MDIX_DIS, ctrl);
|
||||
|
|
Loading…
Reference in a new issue