From a2efa946536c4b643da14025abd8596094991528 Mon Sep 17 00:00:00 2001 From: Felix Radensky Date: Mon, 25 Apr 2011 01:57:12 +0300 Subject: [PATCH] --- yaml --- r: 252483 b: refs/heads/master c: 431e1ecabddcd7cbba237182ddf431771f98bb4c h: refs/heads/master i: 252481: 8f343d85823d7a5dcd677ef6a80b0e33aa92b3d5 252479: 0cd10096095705048c0cfa894bc09bb421a7fbb4 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/mtdconcat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 57eb829154f6..689fd5036f58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a80f1c1f6a15e4eeba5c146ec9c5c0e12458abc5 +refs/heads/master: 431e1ecabddcd7cbba237182ddf431771f98bb4c diff --git a/trunk/drivers/mtd/mtdconcat.c b/trunk/drivers/mtd/mtdconcat.c index 5060e608ea5d..e601672a5305 100644 --- a/trunk/drivers/mtd/mtdconcat.c +++ b/trunk/drivers/mtd/mtdconcat.c @@ -319,7 +319,7 @@ concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops) if (!(mtd->flags & MTD_WRITEABLE)) return -EROFS; - ops->retlen = 0; + ops->retlen = ops->oobretlen = 0; for (i = 0; i < concat->num_subdev; i++) { struct mtd_info *subdev = concat->subdev[i]; @@ -334,7 +334,7 @@ concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops) devops.len = subdev->size - to; err = subdev->write_oob(subdev, to, &devops); - ops->retlen += devops.retlen; + ops->retlen += devops.oobretlen; if (err) return err;