patch-2.4.3 linux/drivers/net/wavelan.c

• Lines: 56
• Date: Sat Mar 3 10:55:47 2001
• Orig file: v2.4.2/linux/drivers/net/wavelan.c
• Orig date: Wed Feb 21 18:20:30 2001

diff -u --recursive --new-file v2.4.2/linux/drivers/net/wavelan.c linux/drivers/net/wavelan.c
@@ -3686,7 +3686,7 @@
 	 * the spinlock. */
 	spin_lock(&lp->spinlock);
 
-	/* Check modem interupt */
+	/* Check modem interrupt */
 	if ((hasr = hasr_read(ioaddr)) & HASR_MMC_INTR) {
 		u8 dce_status;
 
@@ -3913,8 +3913,6 @@
 	}
 	wv_splx(lp, &flags);
 	
-	MOD_INC_USE_COUNT;
-
 #ifdef DEBUG_CALLBACK_TRACE
 	printk(KERN_DEBUG "%s: <-wavelan_open()\n", dev->name);
 #endif
@@ -3947,8 +3945,6 @@
 
 	free_irq(dev->irq, dev);
 
-	MOD_DEC_USE_COUNT;
-
 #ifdef DEBUG_CALLBACK_TRACE
 	printk(KERN_DEBUG "%s: <-wavelan_close()\n", dev->name);
 #endif
@@ -4019,8 +4015,10 @@
 
 	/* Initialize device structures */
 	dev->priv = kmalloc(sizeof(net_local), GFP_KERNEL);
-	if (dev->priv == NULL)
+	if (dev->priv == NULL) {
+		release_region(ioaddr, sizeof(ha_t));
 		return -ENOMEM;
+	}
 	memset(dev->priv, 0x00, sizeof(net_local));
 	lp = (net_local *) dev->priv;
 
@@ -4045,6 +4043,7 @@
 	 */
 	ether_setup(dev);
 
+	SET_MODULE_OWNER(dev);
 	dev->open = wavelan_open;
 	dev->stop = wavelan_close;
 	dev->hard_start_xmit = wavelan_packet_xmit;
@@ -4287,7 +4286,7 @@
 
 /*
  * This software may only be used and distributed
- * according to the terms of the GNU Public License.
+ * according to the terms of the GNU General Public License.
  *
  * This software was developed as a component of the
  * Linux operating system.