patch-2.3.44 linux/drivers/net/3c509.c

• Lines: 58
• Date: Fri Feb 11 08:25:33 2000
• Orig file: v2.3.43/linux/drivers/net/3c509.c
• Orig date: Thu Feb 10 17:11:09 2000

diff -u --recursive --new-file v2.3.43/linux/drivers/net/3c509.c linux/drivers/net/3c509.c
@@ -412,6 +412,9 @@
 		}
 	}
 
+	if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509"))
+		return -EBUSY;
+
 	/* Set the adaptor tag so that the next card can be found. */
 	outb(0xd0 + ++current_tag, id_port);
 
@@ -419,22 +422,26 @@
 	outb((ioaddr >> 4) | 0xe0, id_port);
 
 	EL3WINDOW(0);
-	if (inw(ioaddr) != 0x6d50)
+	if (inw(ioaddr) != 0x6d50) {
+		release_region(ioaddr, EL3_IO_EXTENT);
 		return -ENODEV;
+	}
 
 	/* Free the interrupt so that some other card can use it. */
 	outw(0x0f00, ioaddr + WN0_IRQ);
  found:
 	if (dev == NULL) {
 		dev = init_etherdev(dev, sizeof(struct el3_private));
+		if (dev == NULL) {
+			release_region(ioaddr, EL3_IO_EXTENT);
+			return -ENOMEM;
+		}
 	}
 	memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
 	dev->base_addr = ioaddr;
 	dev->irq = irq;
 	dev->if_port = (dev->mem_start & 0x1f) ? dev->mem_start & 3 : if_port;
 
-	request_region(dev->base_addr, EL3_IO_EXTENT, "3c509");
-
 	{
 		const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};
 		printk("%s: 3c509 at %#3.3lx, %s port, address ",
@@ -599,7 +606,7 @@
 	/* Issue TX_RESET and TX_START commands. */
 	outw(TxReset, ioaddr + EL3_CMD);
 	outw(TxEnable, ioaddr + EL3_CMD);
-	netif_start_queue(dev);
+	netif_wake_queue(dev);
 }
 
 
@@ -609,6 +616,8 @@
 	struct el3_private *lp = (struct el3_private *)dev->priv;
 	int ioaddr = dev->base_addr;
 	unsigned long flags;
+
+	netif_stop_queue (dev);
 
 	lp->stats.tx_bytes += skb->len;