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/hp.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/net/hp.c')
| -rw-r--r-- | drivers/net/hp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/hp.c b/drivers/net/hp.c index d57763e46..c31f97842 100644 --- a/drivers/net/hp.c +++ b/drivers/net/hp.c @@ -157,7 +157,7 @@ __initfunc(int hp_probe1(struct device *dev, int ioaddr)) outb_p(irqmap[irq] | HP_RUN, ioaddr + HP_CONFIGURE); outb_p( 0x00 | HP_RUN, ioaddr + HP_CONFIGURE); if (irq == autoirq_report(0) /* It's a good IRQ line! */ - && request_irq (irq, &ei_interrupt, 0, "hp", NULL) == 0) { + && request_irq (irq, &ei_interrupt, 0, "hp", dev) == 0) { printk(" selecting IRQ %d.\n", irq); dev->irq = *irqp; break; @@ -171,7 +171,7 @@ __initfunc(int hp_probe1(struct device *dev, int ioaddr)) } else { if (dev->irq == 2) dev->irq = 9; - if (request_irq(dev->irq, ei_interrupt, 0, "hp", NULL)) { + if (request_irq(dev->irq, ei_interrupt, 0, "hp", dev)) { printk (" unable to get IRQ %d.\n", dev->irq); return EBUSY; } @@ -180,7 +180,7 @@ __initfunc(int hp_probe1(struct device *dev, int ioaddr)) /* Allocate dev->priv and fill in 8390 specific dev fields. */ if (ethdev_init(dev)) { printk (" unable to get memory for dev->priv.\n"); - free_irq(dev->irq, NULL); + free_irq(dev->irq, dev); return -ENOMEM; } @@ -435,8 +435,7 @@ cleanup_module(void) int ioaddr = dev->base_addr - NIC_OFFSET; kfree(dev->priv); dev->priv = NULL; - free_irq(dev->irq, NULL); - irq2dev_map[dev->irq] = NULL; + free_irq(dev->irq, dev); release_region(ioaddr, HP_IO_EXTENT); unregister_netdev(dev); } |