diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-05-04 22:57:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-05-04 22:57:37 +0200 |
| commit | 679ec154620eaf377143ba429124abc91abed0eb (patch) | |
| tree | f61ddb23bb663722a42728f641663ff0f9fd857d /drivers/net/tsec.c | |
| parent | 900a1fe8c8c7acda1d8903af02c2d0d993b770d8 (diff) | |
| parent | 4324dc72df5879e5b614c4a3f326884723ede9b7 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/tsec.c')
| -rw-r--r-- | drivers/net/tsec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index fd49eff183..3e4c3bd31b 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -1082,7 +1082,8 @@ static void tsec_halt(struct eth_device *dev) regs->dmactrl &= ~(DMACTRL_GRS | DMACTRL_GTS); regs->dmactrl |= (DMACTRL_GRS | DMACTRL_GTS); - while (!(regs->ievent & (IEVENT_GRSC | IEVENT_GTSC))) ; + while ((regs->ievent & (IEVENT_GRSC | IEVENT_GTSC)) + != (IEVENT_GRSC | IEVENT_GTSC)) ; regs->maccfg1 &= ~(MACCFG1_TX_EN | MACCFG1_RX_EN); |