aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/jme.c
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2009-02-27 17:58:16 +0000
committerDavid S. Miller <davem@davemloft.net>2009-03-01 20:39:32 -0800
commiteb352b838d42e66f0267c40249798ffda3c63037 (patch)
tree13bf27e332a56e7d4e969a127cc8728d9ee93134 /drivers/net/jme.c
parent7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc (diff)
jme: Clear all modified GHC register flags
Clear all modified GHC register flags. Fixed-by: Ethan Hsiao <ethanhsiao@jmicron.com> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.c')
-rw-r--r--drivers/net/jme.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index f65a09c363e..47dd47fd0ac 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -429,10 +429,9 @@ jme_check_link(struct net_device *netdev, int testonly)
jme->phylink = phylink;
- ghc = jme->reg_ghc & ~(GHC_SPEED_10M |
- GHC_SPEED_100M |
- GHC_SPEED_1000M |
- GHC_DPX);
+ ghc = jme->reg_ghc & ~(GHC_SPEED | GHC_DPX |
+ GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE |
+ GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY);
switch (phylink & PHY_LINK_SPEED_MASK) {
case PHY_LINK_SPEED_10M:
ghc |= GHC_SPEED_10M |