patch-2.4.2 linux/drivers/net/tokenring/madgemc.c

• Lines: 44
• Date: Fri Feb 16 16:02:36 2001
• Orig file: v2.4.1/linux/drivers/net/tokenring/madgemc.c
• Orig date: Wed Jan 26 13:16:05 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/tokenring/madgemc.c linux/drivers/net/tokenring/madgemc.c
@@ -4,7 +4,7 @@
  *  Written 2000 by Adam Fritzler
  *
  *  This software may be used and distributed according to the terms
- *  of the GNU Public License, incorporated herein by reference.
+ *  of the GNU General Public License, incorporated herein by reference.
  *
  *  This driver module supports the following cards:
  *      - Madge Smart 16/4 Ringnode MC16
@@ -349,7 +349,7 @@
 			printk(":%2.2x", dev->dev_addr[i]);
 		printk("\n");
 
-		if (tmsdev_init(dev)) {
+		if (tmsdev_init(dev, ISA_MAX_ADDRESS, NULL)) {
 			printk("%s: unable to get memory for dev->priv.\n", 
 			       dev->name);
 			return -1;
@@ -362,7 +362,6 @@
 		 * they know what they're talking about.  Cut off DMA
 		 * at 16mb.
 		 */
-		tp->dmalimit = ISA_MAX_ADDRESS; /* XXX: ?? */
 		tp->setnselout = madgemc_setnselout_pins;
 		tp->sifwriteb = madgemc_sifwriteb;
 		tp->sifreadb = madgemc_sifreadb;
@@ -383,7 +382,7 @@
 			printk("madgemc: register_trdev() returned non-zero.\n");
 			
 			kfree(card);
-			kfree(dev->priv);
+			tmsdev_term(dev);
 			kfree(dev);
 			return -1;
 		}
@@ -783,7 +782,7 @@
 		unregister_trdev(dev);
 		release_region(dev->base_addr-MADGEMC_SIF_OFFSET, MADGEMC_IO_EXTENT);
 		free_irq(dev->irq, dev);
-		kfree(dev->priv);
+		tmsdev_term(dev);
 		kfree(dev);
 		this_card = madgemc_card_list;
 		madgemc_card_list = this_card->next;