patch-2.4.0-test5 linux/drivers/net/tokenring/olympic.c
Next file: linux/drivers/net/tokenring/smctr.c
Previous file: linux/drivers/net/tokenring/lanstreamer.c
Back to the patch index
Back to the overall index
- Lines: 20
- Date:
Tue Jul 18 16:52:35 2000
- Orig file:
v2.4.0-test4/linux/drivers/net/tokenring/olympic.c
- Orig date:
Fri Jun 23 21:55:09 2000
diff -u --recursive --new-file v2.4.0-test4/linux/drivers/net/tokenring/olympic.c linux/drivers/net/tokenring/olympic.c
@@ -1628,7 +1628,7 @@
dev_olympic[i]->init = &olympic_probe;
if (register_trdev(dev_olympic[i]) != 0) {
- kfree_s(dev_olympic[i], sizeof(struct net_device));
+ kfree(dev_olympic[i]);
dev_olympic[i] = NULL;
if (i == 0) {
printk("Olympic: No IBM PCI Token Ring cards found in system.\n");
@@ -1651,8 +1651,8 @@
if (dev_olympic[i]) {
unregister_trdev(dev_olympic[i]);
release_region(dev_olympic[i]->base_addr, OLYMPIC_IO_SPACE);
- kfree_s(dev_olympic[i]->priv, sizeof(struct olympic_private));
- kfree_s(dev_olympic[i], sizeof(struct net_device));
+ kfree(dev_olympic[i]->priv);
+ kfree(dev_olympic[i]);
dev_olympic[i] = NULL;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)