aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/config.c
diff options
context:
space:
mode:
authorBurman Yan <yan_952@hotmail.com>2006-12-08 05:39:35 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:29:01 -0500
commit41f96935b4c41daea2c4dbbf137960375cf764c1 (patch)
tree9af3af5e41f68baf063b5f929797c837169bb9df /drivers/isdn/hisax/config.c
parent0b2dd130a5a8774a30de1f94266f6b9a9892153c (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/config.c')
-rw-r--r--drivers/isdn/hisax/config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index cede72cdbb31..9d6b7b0f6746 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -869,14 +869,13 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow
869 struct IsdnCard *card = cards + cardnr; 869 struct IsdnCard *card = cards + cardnr;
870 struct IsdnCardState *cs; 870 struct IsdnCardState *cs;
871 871
872 cs = kmalloc(sizeof(struct IsdnCardState), GFP_ATOMIC); 872 cs = kzalloc(sizeof(struct IsdnCardState), GFP_ATOMIC);
873 if (!cs) { 873 if (!cs) {
874 printk(KERN_WARNING 874 printk(KERN_WARNING
875 "HiSax: No memory for IsdnCardState(card %d)\n", 875 "HiSax: No memory for IsdnCardState(card %d)\n",
876 cardnr + 1); 876 cardnr + 1);
877 goto out; 877 goto out;
878 } 878 }
879 memset(cs, 0, sizeof(struct IsdnCardState));
880 card->cs = cs; 879 card->cs = cs;
881 spin_lock_init(&cs->statlock); 880 spin_lock_init(&cs->statlock);
882 spin_lock_init(&cs->lock); 881 spin_lock_init(&cs->lock);