diff options
author | Burman Yan <yan_952@hotmail.com> | 2006-12-08 05:39:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:29:01 -0500 |
commit | 41f96935b4c41daea2c4dbbf137960375cf764c1 (patch) | |
tree | 9af3af5e41f68baf063b5f929797c837169bb9df /drivers/isdn/act2000 | |
parent | 0b2dd130a5a8774a30de1f94266f6b9a9892153c (diff) |
[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>
Diffstat (limited to 'drivers/isdn/act2000')
-rw-r--r-- | drivers/isdn/act2000/module.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c index 90593e2ef872..e3e5c1399076 100644 --- a/drivers/isdn/act2000/module.c +++ b/drivers/isdn/act2000/module.c | |||
@@ -573,12 +573,11 @@ act2000_alloccard(int bus, int port, int irq, char *id) | |||
573 | { | 573 | { |
574 | int i; | 574 | int i; |
575 | act2000_card *card; | 575 | act2000_card *card; |
576 | if (!(card = (act2000_card *) kmalloc(sizeof(act2000_card), GFP_KERNEL))) { | 576 | if (!(card = kzalloc(sizeof(act2000_card), GFP_KERNEL))) { |
577 | printk(KERN_WARNING | 577 | printk(KERN_WARNING |
578 | "act2000: (%s) Could not allocate card-struct.\n", id); | 578 | "act2000: (%s) Could not allocate card-struct.\n", id); |
579 | return; | 579 | return; |
580 | } | 580 | } |
581 | memset((char *) card, 0, sizeof(act2000_card)); | ||
582 | spin_lock_init(&card->lock); | 581 | spin_lock_init(&card->lock); |
583 | spin_lock_init(&card->mnlock); | 582 | spin_lock_init(&card->mnlock); |
584 | skb_queue_head_init(&card->sndq); | 583 | skb_queue_head_init(&card->sndq); |