patch-2.4.0-test2 linux/drivers/net/ni52.c
Next file: linux/drivers/net/oaknet.c
Previous file: linux/drivers/net/net_init.c
Back to the patch index
Back to the overall index
- Lines: 60
- Date:
Mon Jun 19 13:30:56 2000
- Orig file:
v2.4.0-test1/linux/drivers/net/ni52.c
- Orig date:
Thu May 11 15:30:07 2000
diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/ni52.c linux/drivers/net/ni52.c
@@ -367,7 +367,7 @@
(inb(base_addr+NI52_MAGIC2) == NI52_MAGICVAL2))
return ni52_probe1(dev, base_addr);
} else if (base_addr > 0) /* Don't probe at all. */
- return ENXIO;
+ return -ENXIO;
#ifdef MODULE
printk("%s: no autoprobing allowed for modules.\n",dev->name);
@@ -402,7 +402,7 @@
#endif
dev->base_addr = base_addr;
- return ENODEV;
+ return -ENODEV;
}
static int __init ni52_probe1(struct net_device *dev,int ioaddr)
@@ -414,7 +414,7 @@
if(dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1
|| dev->dev_addr[2] != NI52_ADDR2)
- return ENODEV;
+ return -ENODEV;
printk("%s: NI5210 found at %#3lx, ",dev->name,dev->base_addr);
@@ -428,12 +428,12 @@
if(size != 0x2000 && size != 0x4000)
{
printk("\n%s: Illegal memory size %d. Allowed is 0x2000 or 0x4000 bytes.\n",dev->name,size);
- return ENODEV;
+ return -ENODEV;
}
if(!check586(dev,(char *) dev->mem_start,size))
{
printk("?memcheck, Can't find memory at 0x%lx with size %d!\n",dev->mem_start,size);
- return ENODEV;
+ return -ENODEV;
}
#else
if(dev->mem_start != 0) /* no auto-mem-probe */
@@ -443,7 +443,7 @@
size = 0x2000; /* check for 8K mem */
if(!check586(dev,(char *) dev->mem_start,size)) {
printk("?memprobe, Can't find memory at 0x%lx!\n",dev->mem_start);
- return ENODEV;
+ return -ENODEV;
}
}
}
@@ -455,7 +455,7 @@
{
if(!memaddrs[i]) {
printk("?memprobe, Can't find io-memory!\n");
- return ENODEV;
+ return -ENODEV;
}
dev->mem_start = memaddrs[i];
size = 0x2000; /* check for 8K mem */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)