projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mtd
/
mtdconcat.c
diff --git
a/drivers/mtd/mtdconcat.c
b/drivers/mtd/mtdconcat.c
index eacc3aac732789085b1bbfc86531c6fa5b0dbe17..239a8c806b6772df642bf6cb1385616147e975c8 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;