diff options
author | Niklas Cassel <niklas.cassel@axis.com> | 2015-01-20 04:35:32 -0500 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2015-02-05 23:32:20 -0500 |
commit | d164ea32674ec82e80f480769ffcd2144f901380 (patch) | |
tree | f6daaef3ade2a221e62d07ee58570edbd275a77e /drivers/mtd/mtdconcat.c | |
parent | be802bf955a1aa9b92b71395405899ce076eca6e (diff) |
mtd: concat: set the return lengths properly
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>
Diffstat (limited to 'drivers/mtd/mtdconcat.c')
-rw-r--r-- | drivers/mtd/mtdconcat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index b9000563b9f4..d85c9468d30c 100644 --- 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) | |||
311 | devops.len = subdev->size - to; | 311 | devops.len = subdev->size - to; |
312 | 312 | ||
313 | err = mtd_write_oob(subdev, to, &devops); | 313 | err = mtd_write_oob(subdev, to, &devops); |
314 | ops->retlen += devops.oobretlen; | 314 | ops->retlen += devops.retlen; |
315 | ops->oobretlen += devops.oobretlen; | ||
315 | if (err) | 316 | if (err) |
316 | return err; | 317 | return err; |
317 | 318 | ||