patch-2.3.99-pre7 linux/drivers/net/wan/dlci.c

Next file: linux/drivers/net/wan/hostess_sv11.c
Previous file: linux/drivers/net/wan/cycx_x25.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/wan/dlci.c linux/drivers/net/wan/dlci.c
@@ -441,13 +441,6 @@
 		return(-ENOMEM);
 
 	memset(master, 0, sizeof(*master));
-	master->name = kmalloc(strlen(buf) + 1, GFP_KERNEL);
-
-	if (!master->name)
-	{
-		kfree(master);
-		return(-ENOMEM);
-	}
 
 	strcpy(master->name, buf);
 	master->init = dlci_init;
@@ -456,7 +449,6 @@
 	err = register_netdev(master);
 	if (err < 0)
 	{
-		kfree(master->name);
 		kfree(master);
 		return(err);
 	}
@@ -472,7 +464,6 @@
 	{
 		unregister_netdev(master);
 		kfree(master->priv);
-		kfree(master->name);
 		kfree(master);
 		return(err);
 	}
@@ -516,7 +507,6 @@
 		open_dev[i] = NULL;
 
 	kfree(master->priv);
-	kfree(master->name);
 	kfree(master);
 
 	MOD_DEC_USE_COUNT;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)