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

• Lines: 45
• Date: Fri Feb 16 16:02:36 2001
• Orig file: v2.4.1/linux/drivers/net/tokenring/abyss.c
• Orig date: Tue Dec 5 12:29:38 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/tokenring/abyss.c linux/drivers/net/tokenring/abyss.c
@@ -4,7 +4,7 @@
  *  Written 1999-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 PCI Mk2
@@ -137,7 +137,8 @@
 	 */
 	dev->base_addr += 0x10;
 		
-	ret = tmsdev_init(dev);
+	ret = tmsdev_init(dev,0,pdev);
+	/* XXX: should be the max PCI32 DMA max */
 	if (ret) {
 		printk("%s: unable to get memory for dev->priv.\n", 
 		       dev->name);
@@ -153,7 +154,6 @@
 	printk("\n");
 
 	tp = dev->priv;
-	tp->dmalimit = 0; /* XXX: should be the max PCI32 DMA max */
 	tp->setnselout = abyss_setnselout_pins;
 	tp->sifreadb = abyss_sifreadb;
 	tp->sifreadw = abyss_sifreadw;
@@ -173,7 +173,7 @@
 	return 0;
 
 err_out_tmsdev:
-	kfree(dev->priv);
+	tmsdev_term(dev);
 err_out_irq:
 	free_irq(pdev->irq, dev);
 err_out_region:
@@ -441,7 +441,7 @@
 	unregister_netdev(dev);
 	release_region(dev->base_addr-0x10, ABYSS_IO_EXTENT);
 	free_irq(dev->irq, dev);
-	kfree(dev->priv);
+	tmsdev_term(dev);
 	kfree(dev);
 	pci_set_drvdata(pdev, NULL);
 }