diff --git a/[refs] b/[refs] index 4eba8e194951..0374f4b21458 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e01d1a4b2f7110201e7fe16e561a721d76fab3e +refs/heads/master: 9dc7f30e3bac329998a2a9bb814bd0abc7cb58e2 diff --git a/trunk/drivers/net/bfin_mac.c b/trunk/drivers/net/bfin_mac.c index 0a17fb48c55c..c993a32b3f50 100644 --- a/trunk/drivers/net/bfin_mac.c +++ b/trunk/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 */