patch-2.3.99-pre6 linux/drivers/net/ne2k-pci.c

• Lines: 21
• Date: Fri Apr 21 16:27:21 2000
• Orig file: v2.3.99-pre5/linux/drivers/net/ne2k-pci.c
• Orig date: Mon Mar 27 08:08:26 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/net/ne2k-pci.c linux/drivers/net/ne2k-pci.c
@@ -188,9 +188,10 @@
 		return -ENODEV;
 	}
 	
-	if (pci_enable_device (pdev)) {
+	i = pci_enable_device (pdev);
+	if (i) {
 		printk (KERN_ERR "ne2k-pci: cannot enable device\n");
-		return -EIO;
+		return i;
 	}
 	
 	if (request_region (ioaddr, NE_IO_EXTENT, "ne2k-pci") == NULL) {
@@ -292,6 +293,7 @@
 	/* Set up the rest of the parameters. */
 	dev->irq = irq;
 	dev->base_addr = ioaddr;
+	pdev->driver_data = dev;
 
 	/* Allocate dev->priv and fill in 8390 specific dev fields. */
 	if (ethdev_init(dev)) {