Commit 8494a8f1 authored by Dave Jones's avatar Dave Jones Committed by Jeff Garzik

Merge a2065 net drvr update from 2.4.x:

* make sure to stop chip before enabling interrupt via request_irq
parent 601cc57e
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <linux/crc32.h> #include <linux/crc32.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -496,15 +495,15 @@ static int lance_open (struct net_device *dev) ...@@ -496,15 +495,15 @@ static int lance_open (struct net_device *dev)
last_dev = dev; last_dev = dev;
/* Stop the Lance */
ll->rap = LE_CSR0;
ll->rdp = LE_C0_STOP;
/* Install the Interrupt handler */ /* Install the Interrupt handler */
ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, SA_SHIRQ, ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, SA_SHIRQ,
dev->name, dev); dev->name, dev);
if (ret) return ret; if (ret) return ret;
/* Stop the Lance */
ll->rap = LE_CSR0;
ll->rdp = LE_C0_STOP;
load_csrs (lp); load_csrs (lp);
lance_init_ring (dev); lance_init_ring (dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment