aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/soc_common.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-12-11 15:18:26 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-01-05 18:28:06 -0500
commit8084b372adac9c24ff7abdd939b2e8816e7b88a3 (patch)
treea4a4005d7b025abc0a3e7693404abd0abbfd434b /drivers/pcmcia/soc_common.c
parent6423efaacbf0bce6372897e793d8450c1c08ec8d (diff)
[PATCH] pcmcia: kzalloc conversion
Convert users of kmalloc and memset to kzalloc Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
-rw-r--r--drivers/pcmcia/soc_common.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index a563bd9a8898..ea7d9ca160b2 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -645,13 +645,12 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
645 645
646 down(&soc_pcmcia_sockets_lock); 646 down(&soc_pcmcia_sockets_lock);
647 647
648 sinfo = kmalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL); 648 sinfo = kzalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL);
649 if (!sinfo) { 649 if (!sinfo) {
650 ret = -ENOMEM; 650 ret = -ENOMEM;
651 goto out; 651 goto out;
652 } 652 }
653 653
654 memset(sinfo, 0, SKT_DEV_INFO_SIZE(nr));
655 sinfo->nskt = nr; 654 sinfo->nskt = nr;
656 655
657 /* 656 /*