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 branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
drivers
/
mtd
/
mtdpart.c
diff --git
a/drivers/mtd/mtdpart.c
b/drivers/mtd/mtdpart.c
index
06a9303
..
633def3
100644
(file)
--- a/
drivers/mtd/mtdpart.c
+++ b/
drivers/mtd/mtdpart.c
@@
-94,7
+94,7
@@
static int part_read_oob(struct mtd_info *mtd, loff_t from,
if (from >= mtd->size)
return -EINVAL;
if (from >= mtd->size)
return -EINVAL;
- if (from + ops->len > mtd->size)
+ if (
ops->datbuf &&
from + ops->len > mtd->size)
return -EINVAL;
res = part->master->read_oob(part->master, from + part->offset, ops);
return -EINVAL;
res = part->master->read_oob(part->master, from + part->offset, ops);
@@
-161,7
+161,7
@@
static int part_write_oob(struct mtd_info *mtd, loff_t to,
if (to >= mtd->size)
return -EINVAL;
if (to >= mtd->size)
return -EINVAL;
- if (to + ops->len > mtd->size)
+ if (
ops->datbuf &&
to + ops->len > mtd->size)
return -EINVAL;
return part->master->write_oob(part->master, to + part->offset, ops);
}
return -EINVAL;
return part->master->write_oob(part->master, to + part->offset, ops);
}
@@
-323,14
+323,13
@@
int add_mtd_partitions(struct mtd_info *master,
for (i = 0; i < nbparts; i++) {
/* allocate the partition structure */
for (i = 0; i < nbparts; i++) {
/* allocate the partition structure */
- slave = k
m
alloc (sizeof(*slave), GFP_KERNEL);
+ slave = k
z
alloc (sizeof(*slave), GFP_KERNEL);
if (!slave) {
printk ("memory allocation error while creating partitions for \"%s\"\n",
master->name);
del_mtd_partitions(master);
return -ENOMEM;
}
if (!slave) {
printk ("memory allocation error while creating partitions for \"%s\"\n",
master->name);
del_mtd_partitions(master);
return -ENOMEM;
}
- memset(slave, 0, sizeof(*slave));
list_add(&slave->list, &mtd_partitions);
/* set up the MTD object for this partition */
list_add(&slave->list, &mtd_partitions);
/* set up the MTD object for this partition */
@@
-339,8
+338,7
@@
int add_mtd_partitions(struct mtd_info *master,
slave->mtd.size = parts[i].size;
slave->mtd.writesize = master->writesize;
slave->mtd.oobsize = master->oobsize;
slave->mtd.size = parts[i].size;
slave->mtd.writesize = master->writesize;
slave->mtd.oobsize = master->oobsize;
- slave->mtd.ecctype = master->ecctype;
- slave->mtd.eccsize = master->eccsize;
+ slave->mtd.subpage_sft = master->subpage_sft;
slave->mtd.name = parts[i].name;
slave->mtd.bank_size = master->bank_size;
slave->mtd.name = parts[i].name;
slave->mtd.bank_size = master->bank_size;