diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/arm/kernel/ecard.c | |
parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
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; |