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/znet.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/net/znet.c')
| -rw-r--r-- | drivers/net/znet.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index cb53120a2..8c11e3d9f 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c @@ -247,13 +247,12 @@ __initfunc(int znet_probe(struct device *dev)) zn.tx_dma = netinfo->dma2; /* These should never fail. You can't add devices to a sealed box! */ - if (request_irq(dev->irq, &znet_interrupt, 0, "ZNet", NULL) + if (request_irq(dev->irq, &znet_interrupt, 0, "ZNet", dev) || request_dma(zn.rx_dma,"ZNet rx") || request_dma(zn.tx_dma,"ZNet tx")) { printk(KERN_WARNING "%s: Not opened -- resource busy?!?\n", dev->name); return EBUSY; } - irq2dev_map[dev->irq] = dev; /* Allocate buffer memory. We can cross a 128K boundary, so we must be careful about the allocation. It's easiest to waste 8K. */ @@ -403,7 +402,7 @@ static int znet_send_packet(struct sk_buff *skb, struct device *dev) /* The ZNET interrupt handler. */ static void znet_interrupt(int irq, void *dev_id, struct pt_regs * regs) { - struct device *dev = irq2dev_map[irq]; + struct device *dev = dev_id; int ioaddr; int boguscnt = 20; @@ -602,7 +601,7 @@ static int znet_close(struct device *dev) disable_dma(zn.rx_dma); disable_dma(zn.tx_dma); - free_irq(dev->irq, NULL); + free_irq(dev->irq, dev); if (znet_debug > 1) printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name); |