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

torvalds · torvalds · commit 03c668a93187 · 2016-03-11T16:34:18.000-08:00
Pull MTD fixes from Brian Norris:
 "Late MTD fix for v4.5:

   - A simple error code handling fix for the NAND ECC test; this was a
     regression in v4.5-rc1

   - A MAINTAINERS update, which might as well go in ASAP"

* tag 'for-linus-20160311' of git://git.infradead.org/linux-mtd:
  MAINTAINERS: add a maintainer for the NAND subsystem
  mtd: nand: tests: fix regression introduced in mtd_nandectest
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -7399,6 +7399,17 @@ W:	https://www.myricom.com/support/downloads/myri10ge.html
 S:	Supported
 F:	drivers/net/ethernet/myricom/myri10ge/
 
+NAND FLASH SUBSYSTEM
+M:	Boris Brezillon <boris.brezillon@free-electrons.com>
+R:	Richard Weinberger <richard@nod.at>
+L:	linux-mtd@lists.infradead.org
+W:	http://www.linux-mtd.infradead.org/
+Q:	http://patchwork.ozlabs.org/project/linux-mtd/list/
+T:	git git://github.com/linux-nand/linux.git
+S:	Maintained
+F:	drivers/mtd/nand/
+F:	include/linux/mtd/nand*.h
+
 NATSEMI ETHERNET DRIVER (DP8381x)
 S:	Orphan
 F:	drivers/net/ethernet/natsemi/natsemi.c
diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_nandecctest.c
@@ -187,7 +187,7 @@ static int double_bit_error_detect(void *error_data, void *error_ecc,
 	__nand_calculate_ecc(error_data, size, calc_ecc);
 	ret = __nand_correct_data(error_data, error_ecc, calc_ecc, size);
 
-	return (ret == -1) ? 0 : -EINVAL;
+	return (ret == -EBADMSG) ? 0 : -EINVAL;
 }
 
 static const struct nand_ecc_test nand_ecc_test[] = {

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ static int double_bit_error_detect(void error_data, void error_ecc,`
`187`	`187`	`__nand_calculate_ecc(error_data, size, calc_ecc);`
`188`	`188`	`ret = __nand_correct_data(error_data, error_ecc, calc_ecc, size);`
`189`	`189`
`190`		`- return (ret == -1) ? 0 : -EINVAL;`
	`190`	`+ return (ret == -EBADMSG) ? 0 : -EINVAL;`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`static const struct nand_ecc_test nand_ecc_test[] = {`