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/hardware/avm/b1.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/hardware/avm/b1.c')
-rw-r--r-- | drivers/isdn/hardware/avm/b1.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c index da2729247713..7a69a18d07e2 100644 --- a/drivers/isdn/hardware/avm/b1.c +++ b/drivers/isdn/hardware/avm/b1.c | |||
@@ -65,18 +65,15 @@ avmcard *b1_alloc_card(int nr_controllers) | |||
65 | avmctrl_info *cinfo; | 65 | avmctrl_info *cinfo; |
66 | int i; | 66 | int i; |
67 | 67 | ||
68 | card = kmalloc(sizeof(*card), GFP_KERNEL); | 68 | card = kzalloc(sizeof(*card), GFP_KERNEL); |
69 | if (!card) | 69 | if (!card) |
70 | return NULL; | 70 | return NULL; |
71 | 71 | ||
72 | memset(card, 0, sizeof(*card)); | 72 | cinfo = kzalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL); |
73 | |||
74 | cinfo = kmalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL); | ||
75 | if (!cinfo) { | 73 | if (!cinfo) { |
76 | kfree(card); | 74 | kfree(card); |
77 | return NULL; | 75 | return NULL; |
78 | } | 76 | } |
79 | memset(cinfo, 0, sizeof(*cinfo) * nr_controllers); | ||
80 | 77 | ||
81 | card->ctrlinfo = cinfo; | 78 | card->ctrlinfo = cinfo; |
82 | for (i = 0; i < nr_controllers; i++) { | 79 | for (i = 0; i < nr_controllers; i++) { |
@@ -718,12 +715,11 @@ avmcard_dma_alloc(char *name, struct pci_dev *pdev, long rsize, long ssize) | |||
718 | avmcard_dmainfo *p; | 715 | avmcard_dmainfo *p; |
719 | void *buf; | 716 | void *buf; |
720 | 717 | ||
721 | p = kmalloc(sizeof(avmcard_dmainfo), GFP_KERNEL); | 718 | p = kzalloc(sizeof(avmcard_dmainfo), GFP_KERNEL); |
722 | if (!p) { | 719 | if (!p) { |
723 | printk(KERN_WARNING "%s: no memory.\n", name); | 720 | printk(KERN_WARNING "%s: no memory.\n", name); |
724 | goto err; | 721 | goto err; |
725 | } | 722 | } |
726 | memset(p, 0, sizeof(avmcard_dmainfo)); | ||
727 | 723 | ||
728 | p->recvbuf.size = rsize; | 724 | p->recvbuf.size = rsize; |
729 | buf = pci_alloc_consistent(pdev, rsize, &p->recvbuf.dmaaddr); | 725 | buf = pci_alloc_consistent(pdev, rsize, &p->recvbuf.dmaaddr); |