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-plus.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/net/hp-plus.c')
| -rw-r--r-- | drivers/net/hp-plus.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index b7f85f735..c7f0a5e5d 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c @@ -259,7 +259,7 @@ hpp_open(struct device *dev) int ioaddr = dev->base_addr - NIC_OFFSET; int option_reg; - if (request_irq(dev->irq, &ei_interrupt, 0, "hp-plus", NULL)) { + if (request_irq(dev->irq, &ei_interrupt, 0, "hp-plus", dev)) { return -EAGAIN; } @@ -288,8 +288,7 @@ hpp_close(struct device *dev) int ioaddr = dev->base_addr - NIC_OFFSET; int option_reg = inw(ioaddr + HPP_OPTION); - free_irq(dev->irq, NULL); - irq2dev_map[dev->irq] = NULL; + free_irq(dev->irq, dev); ei_close(dev); outw((option_reg & ~EnableIRQ) | MemDisable | NICReset | ChipReset, ioaddr + HPP_OPTION); @@ -465,7 +464,7 @@ cleanup_module(void) for (this_dev = 0; this_dev < MAX_HPP_CARDS; this_dev++) { struct device *dev = &dev_hpp[this_dev]; if (dev->priv != NULL) { - /* NB: hpp_close() handles free_irq + irq2dev map */ + /* NB: hpp_close() handles free_irq */ int ioaddr = dev->base_addr - NIC_OFFSET; kfree(dev->priv); dev->priv = NULL; |