summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2006-03-08 22:45:52 +0100
committerRomieu Francois <romieu@crap.fr.zoreil.com>2006-03-09 23:09:43 +0100
commit39bf4295bb4bcb0c108f74b72dd2eb5b9b9dfacc (patch)
tree732e995318072a015608d2474954c546315981ca /drivers
parentde2104x: prevent interrupt before the interrupt handler is registered (diff)
downloadlinux-39bf4295bb4bcb0c108f74b72dd2eb5b9b9dfacc.tar.xz
linux-39bf4295bb4bcb0c108f74b72dd2eb5b9b9dfacc.zip
de2104x: fix the TX watchdog
Insert de_init_rings() to reinit the rings before de_init_hw() tries to access them again. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/tulip/de2104x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 9e9e1fe92914..2d0cfbceee22 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1453,6 +1453,8 @@ static void de_tx_timeout (struct net_device *dev)
synchronize_irq(dev->irq);
de_clean_rings(de);
+ de_init_rings(de);
+
de_init_hw(de);
netif_wake_queue(dev);