diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
| commit | 404e86e1550cc2c84bb57a372af784585c732f9a (patch) | |
| tree | c0e8e2d61c1b1c79705c0dc9f0f16e35267286e4 /drivers/net/phy/phy.c | |
| parent | 0206e61b467fde4d7b50f1a64355182a4fd9576b (diff) | |
| parent | b9fa38f75ea7e1f64bc29653ca9758303ce698e4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 12fccb1c76dc..3c18bb594957 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, | |||
| 406 | 406 | ||
| 407 | if (mii_data->reg_num == MII_BMCR | 407 | if (mii_data->reg_num == MII_BMCR |
| 408 | && val & BMCR_RESET | 408 | && val & BMCR_RESET |
| 409 | && phydev->drv->config_init) | 409 | && phydev->drv->config_init) { |
| 410 | phy_scan_fixups(phydev); | ||
| 410 | phydev->drv->config_init(phydev); | 411 | phydev->drv->config_init(phydev); |
| 412 | } | ||
| 411 | break; | 413 | break; |
| 412 | 414 | ||
| 413 | default: | 415 | default: |