diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-20 14:46:41 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-21 17:06:17 -0500 |
commit | d2a02b93cf78205dd23226efb66481569900976e (patch) | |
tree | 94760abdafe5cb72a41d3edd405a26d0c8e2e0d3 /arch/arm/kernel/ecard.c | |
parent | 18ec5c731271939acb414614e964c15c8ef52156 (diff) |
[ARM] Convert kmalloc+memset to kzalloc
Convert all uses of kmalloc followed by memset to use kzalloc instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/ecard.c')
-rw-r--r-- | arch/arm/kernel/ecard.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index 74ea29c3205e..00aa225e8d95 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c | |||
@@ -807,14 +807,12 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot) | |||
807 | unsigned long base; | 807 | unsigned long base; |
808 | int i; | 808 | int i; |
809 | 809 | ||
810 | ec = kmalloc(sizeof(ecard_t), GFP_KERNEL); | 810 | ec = kzalloc(sizeof(ecard_t), GFP_KERNEL); |
811 | if (!ec) { | 811 | if (!ec) { |
812 | ec = ERR_PTR(-ENOMEM); | 812 | ec = ERR_PTR(-ENOMEM); |
813 | goto nomem; | 813 | goto nomem; |
814 | } | 814 | } |
815 | 815 | ||
816 | memset(ec, 0, sizeof(ecard_t)); | ||
817 | |||
818 | ec->slot_no = slot; | 816 | ec->slot_no = slot; |
819 | ec->type = type; | 817 | ec->type = type; |
820 | ec->irq = NO_IRQ; | 818 | ec->irq = NO_IRQ; |