diff -urN /mnt/disk/linux/drivers/net/lne390.c /linux/drivers/net/lne390.c --- /mnt/disk/linux/drivers/net/lne390.c Thu Nov 2 22:01:06 2000 +++ /linux/drivers/net/lne390.c Mon Nov 6 19:10:14 2000 @@ -109,7 +109,7 @@ int ret; if (ioaddr > 0x1ff) { /* Check a single specified location. */ - if (!request_region(ioaddr, LNE390_IO_EXTENT, "lne390")) + if (!request_region(ioaddr, LNE390_IO_EXTENT, dev->name)) return -EBUSY; ret = lne390_probe1(dev, ioaddr); if (ret) @@ -128,7 +128,7 @@ /* EISA spec allows for up to 16 slots, but 8 is typical. */ for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) { - if (!request_region(ioaddr, LNE390_IO_EXTENT, "lne390")) + if (!request_region(ioaddr, LNE390_IO_EXTENT, dev->name)) continue; if (lne390_probe1(dev, ioaddr) == 0) return 0; @@ -195,11 +195,11 @@ } printk(" IRQ %d,", dev->irq); - if (request_irq(dev->irq, ei_interrupt, 0, "lne390", dev)) { + if ((ret = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) { printk (" unable to get IRQ %d.\n", dev->irq); kfree(dev->priv); dev->priv = NULL; - return -EAGAIN; + return ret; } if (dev->mem_start == 0) {