patch-2.4.0-test10 linux/drivers/net/pcnet32.c

• Lines: 42
• Date: Mon Oct 16 12:58:51 2000
• Orig file: v2.4.0-test9/linux/drivers/net/pcnet32.c
• Orig date: Mon Jun 19 13:30:56 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/pcnet32.c linux/drivers/net/pcnet32.c
@@ -42,7 +42,7 @@
 static int pcnet32_debug = 1;
 static int tx_start = 1; /* Mapping -- 0:20, 1:64, 2:128, 3:~220 (depends on chip vers) */
 
-static struct net_device *pcnet32_dev = NULL;
+static struct net_device *pcnet32_dev;
 
 static const int max_interrupt_work = 80;
 static const int rx_copybreak = 200;
@@ -83,8 +83,8 @@
 };
 
 #define MAX_UNITS 8
-static int options[MAX_UNITS] = {0, };
-static int full_duplex[MAX_UNITS] = {0, };
+static int options[MAX_UNITS];
+static int full_duplex[MAX_UNITS];
 
 /*
  *				Theory of Operation
@@ -476,7 +476,7 @@
 static int __init
 pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-    static int card_idx = 0;
+    static int card_idx;
     long ioaddr;
     int err = 0;
 
@@ -683,11 +683,11 @@
     if (fdx && !(lp->options & PORT_ASEL) && full_duplex[card_idx])
 	lp->options |= PORT_FD;
     
-    lp->a = *a;
     if (a == NULL) {
       printk(KERN_ERR "pcnet32: No access methods\n");
       return -ENODEV;
     }
+    lp->a = *a;
     
     /* detect special T1/E1 WAN card by checking for MAC address */
     if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0 && dev->dev_addr[2] == 0x75)