From 2fd412cc01b8da0c0c00b9c8aea3776b7f19c784 Mon Sep 17 00:00:00 2001 From: Wang Jian Date: Wed, 16 Jul 2008 21:46:20 +0800 Subject: [PATCH] --- yaml --- r: 104919 b: refs/heads/master c: 7239016d52c6d568d069f083bdcd17f35ab79fd8 h: refs/heads/master i: 104917: ae07bf0668d2fdbf636865d257000c33b15a361b 104915: b8df7ba77b95d9917dbfb7a1a0341f8eef0c5c4a 104911: 3085b2844b46d5ae1b0768cda09d996d3d54cdd9 v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/marvell.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e62bcf4486ff..f0d8ad63e4f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cf8fa4334e60f27b4a392f432c292f3af268215 +refs/heads/master: 7239016d52c6d568d069f083bdcd17f35ab79fd8 diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c index 737512c00971..4aa547947040 100644 --- a/trunk/drivers/net/phy/marvell.c +++ b/trunk/drivers/net/phy/marvell.c @@ -158,7 +158,6 @@ 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); @@ -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;