diff options
| author | Andy Fleming <afleming@freescale.com> | 2010-04-28 01:43:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-28 01:43:31 +0200 |
| commit | 761ed01b35ca32bfd4166cc3862ae80ee33e3a4b (patch) | |
| tree | ecd09986e227f2cb30e1033c9daa1ad385845b8f /drivers/net/gianfar.c | |
| parent | ipheth: potential null dereferences on error path (diff) | |
| download | linux-761ed01b35ca32bfd4166cc3862ae80ee33e3a4b.tar.xz linux-761ed01b35ca32bfd4166cc3862ae80ee33e3a4b.zip | |
gianfar: Wait for both RX and TX to stop
When gracefully stopping the controller, the driver was continuing if
*either* RX or TX had stopped. We need to wait for both, or the
controller could get into an invalid state.
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/gianfar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index df49af382159..4e97ca182997 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1511,9 +1511,9 @@ static void gfar_halt_nodisable(struct net_device *dev) tempval |= (DMACTRL_GRS | DMACTRL_GTS); gfar_write(®s->dmactrl, tempval); - while (!(gfar_read(®s->ievent) & - (IEVENT_GRSC | IEVENT_GTSC))) - cpu_relax(); + spin_event_timeout(((gfar_read(®s->ievent) & + (IEVENT_GRSC | IEVENT_GTSC)) == + (IEVENT_GRSC | IEVENT_GTSC)), -1, 0); } } |