projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be802bf
)
mtd: concat: set the return lengths properly
author
Niklas Cassel
<niklas.cassel@axis.com>
Tue, 20 Jan 2015 09:35:32 +0000
(10:35 +0100)
committer
Brian Norris
<computersforpeace@gmail.com>
Fri, 6 Feb 2015 04:32:20 +0000
(20:32 -0800)
In concat_read_oob both retlen and oobretlen should be updated.
concat_write_oob previously only (improperly) updated retlen.
Signed-off-by: Niklas Cassel <niklass@axis.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/mtdconcat.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/mtd/mtdconcat.c
b/drivers/mtd/mtdconcat.c
index b9000563b9f4311d63ffdfe66ba5166eb158b482..d85c9468d30c9327a2186ca88515396b25dfb5c2 100644
(file)
--- a/
drivers/mtd/mtdconcat.c
+++ b/
drivers/mtd/mtdconcat.c
@@
-311,7
+311,8
@@
concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops)
devops.len = subdev->size - to;
err = mtd_write_oob(subdev, to, &devops);
- ops->retlen += devops.oobretlen;
+ ops->retlen += devops.retlen;
+ ops->oobretlen += devops.oobretlen;
if (err)
return err;