diff -urN /mnt/disk/linux/drivers/net/e2100.c /linux/drivers/net/e2100.c --- /mnt/disk/linux/drivers/net/e2100.c Thu Nov 2 22:01:00 2000 +++ /linux/drivers/net/e2100.c Mon Nov 6 18:59:33 2000 @@ -140,8 +140,8 @@ unsigned char *station_addr = dev->dev_addr; static unsigned version_printed = 0; - if (!request_region(ioaddr, E21_IO_EXTENT, "e2100")) - return -ENODEV; + if (!request_region(ioaddr, E21_IO_EXTENT, dev->name)) + return -EBUSY; /* First check the station address for the Ctron prefix. */ if (inb(ioaddr + E21_SAPROM + 0) != 0x00 @@ -255,10 +255,10 @@ e21_open(struct net_device *dev) { short ioaddr = dev->base_addr; + int retval; - if (request_irq(dev->irq, ei_interrupt, 0, "e2100", dev)) { - return -EBUSY; - } + if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) + return retval; /* Set the interrupt line and memory base on the hardware. */ inb(ioaddr + E21_IRQ_LOW);