linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / kernel / ecard.c

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 00aa225..74ea29c 100644 (file)
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -807,12 +807,14 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
        unsigned long base;
        int i;
 
-       ec = kzalloc(sizeof(ecard_t), GFP_KERNEL);
+       ec = kmalloc(sizeof(ecard_t), GFP_KERNEL);
        if (!ec) {
                ec = ERR_PTR(-ENOMEM);
                goto nomem;
        }
 
+       memset(ec, 0, sizeof(ecard_t));
+
        ec->slot_no = slot;
        ec->type = type;
        ec->irq = NO_IRQ;