Merge tag 'for-linus-20170812' of git://git.infradead.org/linux-mtd

torvalds · torvalds · commit 89a55278dee4 · 2017-08-12T16:19:43.000-07:00
Pull another MTD fix from Brian Norris:
 "An mtdblock regression occurred in -rc1 (all writes were broken!), in
  the process of some block subsystem refactoring. Noticed and fixed
  last week, but I'm a little slow on the uptake"

* tag 'for-linus-20170812' of git://git.infradead.org/linux-mtd:
  mtd: blkdevs: Fix mtd block write failure
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
@@ -113,6 +113,7 @@ static blk_status_t do_blktrans_request(struct mtd_blktrans_ops *tr,
 		for (; nsect > 0; nsect--, block++, buf += tr->blksize)
 			if (tr->writesect(dev, block, buf))
 				return BLK_STS_IOERR;
+		return BLK_STS_OK;
 	default:
 		return BLK_STS_IOERR;
 	}

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ static blk_status_t do_blktrans_request(struct mtd_blktrans_ops *tr,`
`113`	`113`	`for (; nsect > 0; nsect--, block++, buf += tr->blksize)`
`114`	`114`	`if (tr->writesect(dev, block, buf))`
`115`	`115`	`return BLK_STS_IOERR;`
	`116`	`+ return BLK_STS_OK;`
`116`	`117`	`default:`
`117`	`118`	`return BLK_STS_IOERR;`
`118`	`119`	`}`