From: Niklas Cassel <niklas.cassel@axis.com>
Date: Tue, 20 Jan 2015 09:35:32 +0000 (+0100)
Subject: mtd: concat: set the return lengths properly
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d164ea32674ec82e80f480769ffcd2144f901380;p=linux-beck.git

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>
---

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)
 			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;