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/hisax/hisax_fcpcipnp.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/hisax/hisax_fcpcipnp.c')
-rw-r--r-- | drivers/isdn/hisax/hisax_fcpcipnp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c index f6db55a752c4..9e088fce8c3a 100644 --- a/drivers/isdn/hisax/hisax_fcpcipnp.c +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c | |||
@@ -841,12 +841,10 @@ new_adapter(void) | |||
841 | struct hisax_b_if *b_if[2]; | 841 | struct hisax_b_if *b_if[2]; |
842 | int i; | 842 | int i; |
843 | 843 | ||
844 | adapter = kmalloc(sizeof(struct fritz_adapter), GFP_KERNEL); | 844 | adapter = kzalloc(sizeof(struct fritz_adapter), GFP_KERNEL); |
845 | if (!adapter) | 845 | if (!adapter) |
846 | return NULL; | 846 | return NULL; |
847 | 847 | ||
848 | memset(adapter, 0, sizeof(struct fritz_adapter)); | ||
849 | |||
850 | adapter->isac.hisax_d_if.owner = THIS_MODULE; | 848 | adapter->isac.hisax_d_if.owner = THIS_MODULE; |
851 | adapter->isac.hisax_d_if.ifc.priv = &adapter->isac; | 849 | adapter->isac.hisax_d_if.ifc.priv = &adapter->isac; |
852 | adapter->isac.hisax_d_if.ifc.l2l1 = isac_d_l2l1; | 850 | adapter->isac.hisax_d_if.ifc.l2l1 = isac_d_l2l1; |