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
Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
drivers
/
mtd
/
mtdconcat.c
diff --git
a/drivers/mtd/mtdconcat.c
b/drivers/mtd/mtdconcat.c
index
db6de74
..
7e07562
100644
(file)
--- a/
drivers/mtd/mtdconcat.c
+++ b/
drivers/mtd/mtdconcat.c
@@
-183,10
+183,9
@@
concat_writev(struct mtd_info *mtd, const struct kvec *vecs,
}
/* make a copy of vecs */
}
/* make a copy of vecs */
- vecs_copy = km
alloc(
sizeof(struct kvec) * count, GFP_KERNEL);
+ vecs_copy = km
emdup(vecs,
sizeof(struct kvec) * count, GFP_KERNEL);
if (!vecs_copy)
return -ENOMEM;
if (!vecs_copy)
return -ENOMEM;
- memcpy(vecs_copy, vecs, sizeof(struct kvec) * count);
entry_low = 0;
for (i = 0; i < concat->num_subdev; i++) {
entry_low = 0;
for (i = 0; i < concat->num_subdev; i++) {