From 132c804a3992af942a615277cfa1b448617a32ad Mon Sep 17 00:00:00 2001 From: Yan Burman Date: Wed, 6 Dec 2006 20:40:33 -0800 Subject: [PATCH] --- yaml --- r: 42953 b: refs/heads/master c: a0172a6dd906cf813cd56aeb133a85abf9a36c8e h: refs/heads/master i: 42951: f90646f6e93e3cb0a6e2ee06a2af52981bb4728a v: v3 --- [refs] | 2 +- trunk/arch/arm26/kernel/ecard.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 54e7698d585f..482de2092615 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b593e48d2bf09c40c0f5165f2f2a10cc3983ea51 +refs/heads/master: a0172a6dd906cf813cd56aeb133a85abf9a36c8e diff --git a/trunk/arch/arm26/kernel/ecard.c b/trunk/arch/arm26/kernel/ecard.c index 047d0a408b9d..43dd41be71fb 100644 --- a/trunk/arch/arm26/kernel/ecard.c +++ b/trunk/arch/arm26/kernel/ecard.c @@ -620,12 +620,10 @@ ecard_probe(int slot, card_type_t type) struct ex_ecid cid; int i, rc = -ENOMEM; - ec = kmalloc(sizeof(ecard_t), GFP_KERNEL); + ec = kzalloc(sizeof(ecard_t), GFP_KERNEL); if (!ec) goto nomem; - memset(ec, 0, sizeof(ecard_t)); - ec->slot_no = slot; ec->type = type; ec->irq = NO_IRQ;