aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorJérôme Pouiller <jezz@sysmic.org>2015-12-03 10:02:35 +0100
committerDavid S. Miller <davem@davemloft.net>2015-12-03 15:26:13 -0500
commitcf18b7788fe1bf99e9c2ab580b065bf2d3cb1a34 (patch)
tree32f7b797da77ecb96c17ab5b7fee48cbbd562ff1 /drivers/net/phy
parentc5ba5c8ac86591f5ee2570ec989377cdda2be237 (diff)
downloadlinux-linaro-stable-cf18b7788fe1bf99e9c2ab580b065bf2d3cb1a34.tar.gz
net: phy: reset only targeted phy
It is possible to address another chip on same MDIO bus. The case is correctly handled for media advertising. It is taken into account only if mii_data->phy_id == phydev->addr. However, this condition was missing for reset case. Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/phy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 48ce6ef400fe..47cd306dbb3c 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -448,7 +448,8 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd)
mdiobus_write(phydev->bus, mii_data->phy_id,
mii_data->reg_num, val);
- if (mii_data->reg_num == MII_BMCR &&
+ if (mii_data->phy_id == phydev->addr &&
+ mii_data->reg_num == MII_BMCR &&
val & BMCR_RESET)
return phy_init_hw(phydev);