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/de620.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/net/de620.c')
| -rw-r--r-- | drivers/net/de620.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index 60bc9229d..ff2251c5f 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c @@ -439,11 +439,10 @@ de620_get_register(struct device *dev, byte reg) static int de620_open(struct device *dev) { - if (request_irq(dev->irq, de620_interrupt, 0, "de620", NULL)) { + if (request_irq(dev->irq, de620_interrupt, 0, "de620", dev)) { printk ("%s: unable to get IRQ %d\n", dev->name, dev->irq); return 1; } - irq2dev_map[dev->irq] = dev; MOD_INC_USE_COUNT; if (adapter_init(dev)) { @@ -464,8 +463,7 @@ de620_close(struct device *dev) /* disable recv */ de620_set_register(dev, W_TCR, RXOFF); - free_irq(dev->irq, NULL); - irq2dev_map[dev->irq] = NULL; + free_irq(dev->irq, dev); dev->start = 0; MOD_DEC_USE_COUNT; @@ -595,7 +593,7 @@ de620_start_xmit(struct sk_buff *skb, struct device *dev) static void de620_interrupt(int irq_in, void *dev_id, struct pt_regs *regs) { - struct device *dev = irq2dev_map[irq_in]; + struct device *dev = dev_id; byte irq_status; int bogus_count = 0; int again = 0; |