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/hysdn/hycapi.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/hysdn/hycapi.c')
-rw-r--r-- | drivers/isdn/hysdn/hycapi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index 6bac43cc91bd..b2ae4ec1e49e 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c | |||
@@ -745,12 +745,11 @@ hycapi_capi_create(hysdn_card *card) | |||
745 | return 1; | 745 | return 1; |
746 | } | 746 | } |
747 | if (!card->hyctrlinfo) { | 747 | if (!card->hyctrlinfo) { |
748 | cinfo = (hycapictrl_info *) kmalloc(sizeof(hycapictrl_info), GFP_ATOMIC); | 748 | cinfo = kzalloc(sizeof(hycapictrl_info), GFP_ATOMIC); |
749 | if (!cinfo) { | 749 | if (!cinfo) { |
750 | printk(KERN_WARNING "HYSDN: no memory for capi-ctrl.\n"); | 750 | printk(KERN_WARNING "HYSDN: no memory for capi-ctrl.\n"); |
751 | return -ENOMEM; | 751 | return -ENOMEM; |
752 | } | 752 | } |
753 | memset(cinfo, 0, sizeof(hycapictrl_info)); | ||
754 | card->hyctrlinfo = cinfo; | 753 | card->hyctrlinfo = cinfo; |
755 | cinfo->card = card; | 754 | cinfo->card = card; |
756 | spin_lock_init(&cinfo->lock); | 755 | spin_lock_init(&cinfo->lock); |