---

yaml --- r: 254686 b: refs/heads/master c: 91a5615 h: refs/heads/master v: v3
git-mirror · Jul 6, 2011 · f3b6fed · f3b6fed
1 parent 03c750c
commit f3b6fed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 712ae51afd55b20c04c5383d02ba5d10233313b1
+refs/heads/master: 91a5615203355bb34e0b9e68e94f27f24719a74c
diff --git a/trunk/drivers/net/sh_eth.c b/trunk/drivers/net/sh_eth.c
@@ -1184,8 +1184,8 @@ static void sh_eth_adjust_link(struct net_device *ndev)
 				mdp->cd->set_rate(ndev);
 		}
 		if (mdp->link == PHY_DOWN) {
-			sh_eth_write(ndev, (sh_eth_read(ndev, ECMR) & ~ECMR_TXF)
-					| ECMR_DM, ECMR);
+			sh_eth_write(ndev,
+				(sh_eth_read(ndev, ECMR) & ~ECMR_TXF), ECMR);
 			new_state = 1;
 			mdp->link = phydev->link;
 		}