diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/net/e2100.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/net/e2100.c')
| -rw-r--r-- | drivers/net/e2100.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c index 4b6e67daf..3c2288f6a 100644 --- a/drivers/net/e2100.c +++ b/drivers/net/e2100.c @@ -254,10 +254,9 @@ e21_open(struct device *dev) { short ioaddr = dev->base_addr; - if (request_irq(dev->irq, ei_interrupt, 0, "e2100", NULL)) { + if (request_irq(dev->irq, ei_interrupt, 0, "e2100", dev)) { return EBUSY; } - irq2dev_map[dev->irq] = dev; /* Set the interrupt line and memory base on the hardware. */ inb(ioaddr + E21_IRQ_LOW); @@ -353,7 +352,7 @@ e21_close(struct device *dev) if (ei_debug > 1) printk("%s: Shutting down ethercard.\n", dev->name); - free_irq(dev->irq, NULL); + free_irq(dev->irq, dev); dev->irq = ei_status.saved_irq; /* Shut off the interrupt line and secondary interface. */ @@ -362,8 +361,6 @@ e21_close(struct device *dev) inb(ioaddr + E21_IRQ_HIGH); /* High IRQ bit, and if_port. */ outb(0, ioaddr + E21_ASIC); - irq2dev_map[dev->irq] = NULL; - ei_close(dev); /* Double-check that the memory has been turned off, because really @@ -442,7 +439,7 @@ cleanup_module(void) for (this_dev = 0; this_dev < MAX_E21_CARDS; this_dev++) { struct device *dev = &dev_e21[this_dev]; if (dev->priv != NULL) { - /* NB: e21_close() handles free_irq + irq2dev map */ + /* NB: e21_close() handles free_irq */ kfree(dev->priv); dev->priv = NULL; release_region(dev->base_addr, E21_IO_EXTENT); |