summaryrefslogtreecommitdiff
path: root/drivers/net/phy/phy.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-25 07:31:07 (GMT)
committerDavid S. Miller <davem@davemloft.net>2008-04-25 07:31:07 (GMT)
commitcc93d7d77d28d65d4f947dabc95a01c42d713ea3 (patch)
treebdaa01a54c7d881b7087551daf85fa52c61b3d1c /drivers/net/phy/phy.c
parent461e6c856faf9cdd8862fa4d0785974a64e39dba (diff)
parentf946dffed6334f08da065a89ed65026ebf8b33b4 (diff)
downloadlinux-fsl-qoriq-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.tar.xz
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy/phy.c')
-rw-r--r--drivers/net/phy/phy.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 12fccb1..3c18bb5 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -406,8 +406,10 @@ int phy_mii_ioctl(struct phy_device *phydev,
if (mii_data->reg_num == MII_BMCR
&& val & BMCR_RESET
- && phydev->drv->config_init)
+ && phydev->drv->config_init) {
+ phy_scan_fixups(phydev);
phydev->drv->config_init(phydev);
+ }
break;
default: