[PATCH] isdn: replace kmalloc+memset with kzalloc
Acked-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
0b2dd130a5
commit
41f96935b4
@@ -2542,17 +2542,15 @@ isdn_net_new(char *name, struct net_device *master)
|
||||
printk(KERN_WARNING "isdn_net: interface %s already exists\n", name);
|
||||
return NULL;
|
||||
}
|
||||
if (!(netdev = (isdn_net_dev *) kmalloc(sizeof(isdn_net_dev), GFP_KERNEL))) {
|
||||
if (!(netdev = kzalloc(sizeof(isdn_net_dev), GFP_KERNEL))) {
|
||||
printk(KERN_WARNING "isdn_net: Could not allocate net-device\n");
|
||||
return NULL;
|
||||
}
|
||||
memset(netdev, 0, sizeof(isdn_net_dev));
|
||||
if (!(netdev->local = (isdn_net_local *) kmalloc(sizeof(isdn_net_local), GFP_KERNEL))) {
|
||||
if (!(netdev->local = kzalloc(sizeof(isdn_net_local), GFP_KERNEL))) {
|
||||
printk(KERN_WARNING "isdn_net: Could not allocate device locals\n");
|
||||
kfree(netdev);
|
||||
return NULL;
|
||||
}
|
||||
memset(netdev->local, 0, sizeof(isdn_net_local));
|
||||
if (name == NULL)
|
||||
strcpy(netdev->local->name, " ");
|
||||
else
|
||||
|
Reference in New Issue
Block a user