projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
drivers
/
mtd
/
inftlmount.c
diff --git
a/drivers/mtd/inftlmount.c
b/drivers/mtd/inftlmount.c
index
acf3ba2
..
b8917be
100644
(file)
--- a/
drivers/mtd/inftlmount.c
+++ b/
drivers/mtd/inftlmount.c
@@
-31,7
+31,6
@@
#include <asm/io.h>
#include <asm/uaccess.h>
#include <linux/miscdevice.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <linux/miscdevice.h>
-#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/init.h>
@@
-581,14
+580,13
@@
int INFTL_mount(struct INFTLrecord *s)
logical_block = block = BLOCK_NIL;
/* Temporary buffer to store ANAC numbers. */
logical_block = block = BLOCK_NIL;
/* Temporary buffer to store ANAC numbers. */
- ANACtable = k
malloc(s->nb_blocks *
sizeof(u8), GFP_KERNEL);
+ ANACtable = k
calloc(s->nb_blocks,
sizeof(u8), GFP_KERNEL);
if (!ANACtable) {
printk(KERN_WARNING "INFTL: allocation of ANACtable "
"failed (%zd bytes)\n",
s->nb_blocks * sizeof(u8));
return -ENOMEM;
}
if (!ANACtable) {
printk(KERN_WARNING "INFTL: allocation of ANACtable "
"failed (%zd bytes)\n",
s->nb_blocks * sizeof(u8));
return -ENOMEM;
}
- memset(ANACtable, 0, s->nb_blocks);
/*
* First pass is to explore each physical unit, and construct the
/*
* First pass is to explore each physical unit, and construct the