From f3b6fed0ad7c23b67a33783aa4456a8d0a995ee2 Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda Date: Tue, 5 Jul 2011 20:33:51 +0000 Subject: [PATCH] --- yaml --- r: 254686 b: refs/heads/master c: 91a5615203355bb34e0b9e68e94f27f24719a74c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sh_eth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2a3455590ea6..2a848e5961a0 100644 --- 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 index 8a72a979ee71..35bbc2718c13 100644 --- 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; }