git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull button into test branch
[pandora-kernel.git]
/
arch
/
arm26
/
kernel
/
ecard.c
diff --git
a/arch/arm26/kernel/ecard.c
b/arch/arm26/kernel/ecard.c
index
047d0a4
..
9dbc172
100644
(file)
--- a/
arch/arm26/kernel/ecard.c
+++ b/
arch/arm26/kernel/ecard.c
@@
-215,7
+215,7
@@
int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
}
if (c_id(&excd) == 0x80) { /* loader */
if (!ec->loader) {
}
if (c_id(&excd) == 0x80) { /* loader */
if (!ec->loader) {
- ec->loader =
(loader_t)
kmalloc(c_len(&excd),
+ ec->loader = kmalloc(c_len(&excd),
GFP_KERNEL);
if (ec->loader)
ecard_readbytes(ec->loader, ec,
GFP_KERNEL);
if (ec->loader)
ecard_readbytes(ec->loader, ec,
@@
-620,12
+620,10
@@
ecard_probe(int slot, card_type_t type)
struct ex_ecid cid;
int i, rc = -ENOMEM;
struct ex_ecid cid;
int i, rc = -ENOMEM;
- ec = k
m
alloc(sizeof(ecard_t), GFP_KERNEL);
+ ec = k
z
alloc(sizeof(ecard_t), GFP_KERNEL);
if (!ec)
goto nomem;
if (!ec)
goto nomem;
- memset(ec, 0, sizeof(ecard_t));
-
ec->slot_no = slot;
ec->type = type;
ec->irq = NO_IRQ;
ec->slot_no = slot;
ec->type = type;
ec->irq = NO_IRQ;