diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-12 03:34:18 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-12 03:34:18 +0300 |
| commit | 03c668a93187fe7fba9464f96fbe7c22eebd9897 (patch) | |
| tree | 5b218ecc44306241375257f1dae94fa115468a3e | |
| parent | 3ab0a0f91cca6a9988ef1544176cd7f2106ec722 (diff) | |
| parent | 9df4f913eb39046fa57c4217bb3429a63e164000 (diff) | |
| download | linux-03c668a93187fe7fba9464f96fbe7c22eebd9897.tar.xz | |
Merge tag 'for-linus-20160311' of git://git.infradead.org/linux-mtd
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
| -rw-r--r-- | MAINTAINERS | 11 | ||||
| -rw-r--r-- | drivers/mtd/tests/mtd_nandecctest.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4029c63d8a7d..6ee06ea47be4 100644 --- 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 index 79316159eec6..88b6c81cebbe 100644 --- 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[] = { |