diff -urN /mnt/disk/linux/drivers/net/ac3200.c /linux/drivers/net/ac3200.c --- /mnt/disk/linux/drivers/net/ac3200.c Thu Nov 2 22:01:00 2000 +++ /linux/drivers/net/ac3200.c Mon Nov 6 18:45:54 2000 @@ -121,8 +118,8 @@ { int i, retval; - if (!request_region(ioaddr, AC_IO_EXTENT, "ac3200")) - return -ENODEV; + if (!request_region(ioaddr, AC_IO_EXTENT, dev->name)) + return -EBUSY; if (inb_p(ioaddr + AC_ID_PORT) == 0xff) { retval = -ENODEV; @@ -172,9 +169,8 @@ printk(", assigning"); } - if (request_irq(dev->irq, ei_interrupt, 0, "ac3200", dev)) { + if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) { printk (" nothing! Unable to get IRQ %d.\n", dev->irq); - retval = -EAGAIN; goto out1; } @@ -260,11 +256,13 @@ static int ac_open(struct net_device *dev) { #ifdef notyet + int retval; + /* Someday we may enable the IRQ and shared memory here. */ int ioaddr = dev->base_addr; - if (request_irq(dev->irq, ei_interrupt, 0, "ac3200", dev)) - return -EAGAIN; + if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) + return retval; #endif ei_open(dev);