diff -urN /mnt/disk/linux/drivers/net/eth16i.c /linux/drivers/net/eth16i.c --- /mnt/disk/linux/drivers/net/eth16i.c Thu Nov 16 22:57:20 2000 +++ /linux/drivers/net/eth16i.c Sun Nov 19 22:09:20 2000 @@ -486,7 +486,7 @@ if(eth16i_portlist[(inb(ioaddr + JUMPERLESS_CONFIG) & 0x07)] != ioaddr) { retval = -ENODEV; - goto out; + goto err_out; } } @@ -494,7 +494,7 @@ if(eth16i_check_signature(ioaddr) != 0) { retval = -ENODEV; - goto out; + goto err_out; } /* @@ -522,7 +522,7 @@ if ((retval = request_irq(dev->irq, (void *)ð16i_interrupt, 0, dev->name, dev))) { printk(KERN_WARNING "%s: %s at %#3x, but is unusable due conflicting IRQ %d.\n", dev->name, cardname, ioaddr, dev->irq); - goto out; + goto err_out; } printk(KERN_INFO "%s: %s at %#3x, IRQ %d, ", @@ -544,7 +544,7 @@ if(dev->priv == NULL) { free_irq(dev->irq, dev); retval = -ENOMEM; - goto out; + goto err_out; } } @@ -566,7 +566,8 @@ boot = 0; return 0; -out: + +err_out: release_region(ioaddr, ETH16I_IO_EXTENT); return retval; } @@ -858,7 +859,7 @@ creg[i] = inb(ioaddr + TRANSMIT_MODE_REG + i); if(eth16i_debug > 1) - printk("eth16i: read signature byte %x at %x\n", + printk(KERN_DEBUG "eth16i: read signature byte %x at %x\n", creg[i], ioaddr + TRANSMIT_MODE_REG + i); }