Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 32a8503a7acd..4aa547947040 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -158,11 +158,10 @@ static int m88e1111_config_init(struct phy_device *phydev)
 {
         int err;
         int temp;
-        int mode;
 
         /* Enable Fiber/Copper auto selection */
         temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
-        temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
+        temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO;
         phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
 
         temp = phy_read(phydev, MII_BMCR);
@@ -198,9 +197,7 @@ static int m88e1111_config_init(struct phy_device *phydev)
 
                 temp &= ~(MII_M1111_HWCFG_MODE_MASK);
 
-                mode = phy_read(phydev, MII_M1111_PHY_EXT_CR);
-
-                if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES)
+                if (temp & MII_M1111_HWCFG_FIBER_COPPER_RES)
                         temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII;
                 else
                         temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII;