diff options
| author | Guo-Fu Tseng <cooldavid@cooldavid.org> | 2009-02-27 12:58:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-01 23:39:32 -0500 |
| commit | eb352b838d42e66f0267c40249798ffda3c63037 (patch) | |
| tree | 13bf27e332a56e7d4e969a127cc8728d9ee93134 /drivers | |
| parent | 7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc (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')
| -rw-r--r-- | drivers/net/jme.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index f65a09c363ed..47dd47fd0ace 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
| @@ -429,10 +429,9 @@ jme_check_link(struct net_device *netdev, int testonly) | |||
| 429 | 429 | ||
| 430 | jme->phylink = phylink; | 430 | jme->phylink = phylink; |
| 431 | 431 | ||
| 432 | ghc = jme->reg_ghc & ~(GHC_SPEED_10M | | 432 | ghc = jme->reg_ghc & ~(GHC_SPEED | GHC_DPX | |
| 433 | GHC_SPEED_100M | | 433 | GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE | |
| 434 | GHC_SPEED_1000M | | 434 | GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY); |
| 435 | GHC_DPX); | ||
| 436 | switch (phylink & PHY_LINK_SPEED_MASK) { | 435 | switch (phylink & PHY_LINK_SPEED_MASK) { |
| 437 | case PHY_LINK_SPEED_10M: | 436 | case PHY_LINK_SPEED_10M: |
| 438 | ghc |= GHC_SPEED_10M | | 437 | ghc |= GHC_SPEED_10M | |