summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Wu <bryan.wu@analog.com>2008-01-30 16:52:28 +0800
committerDavid S. Miller <davem@davemloft.net>2008-02-03 04:28:51 -0800
commit9dc7f30e3bac329998a2a9bb814bd0abc7cb58e2 (patch)
tree540e725cbb9190af32f987a4cc942aea0c2a217e
parent6e01d1a4b2f7110201e7fe16e561a721d76fab3e (diff)
downloadop-kernel-dev-9dc7f30e3bac329998a2a9bb814bd0abc7cb58e2.zip
op-kernel-dev-9dc7f30e3bac329998a2a9bb814bd0abc7cb58e2.tar.gz
EMAC driver: Fix bug: The clock divisor is set to all ones at reset.
Signed-off-by: Kalle Pokki <kalle.pokki@eke.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bfin_mac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 0a17fb4..c993a32 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -408,7 +408,7 @@ static int mii_probe(struct net_device *dev)
mdc_div = ((sclk / MDC_CLK) / 2) - 1;
sysctl = bfin_read_EMAC_SYSCTL();
- sysctl |= SET_MDCDIV(mdc_div);
+ sysctl = (sysctl & ~MDCDIV) | SET_MDCDIV(mdc_div);
bfin_write_EMAC_SYSCTL(sysctl);
/* search for connect PHY device */
OpenPOWER on IntegriCloud