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/isdnloop/isdnloop.c | |
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/isdnloop/isdnloop.c')
-rw-r--r-- | drivers/isdn/isdnloop/isdnloop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c index c3ae2edaf6fa..e3add27dd0e1 100644 --- a/drivers/isdn/isdnloop/isdnloop.c +++ b/drivers/isdn/isdnloop/isdnloop.c | |||
@@ -1430,12 +1430,11 @@ isdnloop_initcard(char *id) | |||
1430 | isdnloop_card *card; | 1430 | isdnloop_card *card; |
1431 | int i; | 1431 | int i; |
1432 | 1432 | ||
1433 | if (!(card = (isdnloop_card *) kmalloc(sizeof(isdnloop_card), GFP_KERNEL))) { | 1433 | if (!(card = kzalloc(sizeof(isdnloop_card), GFP_KERNEL))) { |
1434 | printk(KERN_WARNING | 1434 | printk(KERN_WARNING |
1435 | "isdnloop: (%s) Could not allocate card-struct.\n", id); | 1435 | "isdnloop: (%s) Could not allocate card-struct.\n", id); |
1436 | return (isdnloop_card *) 0; | 1436 | return (isdnloop_card *) 0; |
1437 | } | 1437 | } |
1438 | memset((char *) card, 0, sizeof(isdnloop_card)); | ||
1439 | card->interface.owner = THIS_MODULE; | 1438 | card->interface.owner = THIS_MODULE; |
1440 | card->interface.channels = ISDNLOOP_BCH; | 1439 | card->interface.channels = ISDNLOOP_BCH; |
1441 | card->interface.hl_hdrlen = 1; /* scratch area for storing ack flag*/ | 1440 | card->interface.hl_hdrlen = 1; /* scratch area for storing ack flag*/ |