summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-11 16:34:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-11 16:34:18 -0800
commit03c668a93187fe7fba9464f96fbe7c22eebd9897 (patch)
tree5b218ecc44306241375257f1dae94fa115468a3e /drivers
parent3ab0a0f91cca6a9988ef1544176cd7f2106ec722 (diff)
parent9df4f913eb39046fa57c4217bb3429a63e164000 (diff)
downloadlinux-stable-03c668a93187fe7fba9464f96fbe7c22eebd9897.tar.gz
linux-stable-03c668a93187fe7fba9464f96fbe7c22eebd9897.tar.bz2
linux-stable-03c668a93187fe7fba9464f96fbe7c22eebd9897.zip
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/tests/mtd_nandecctest.c2
1 files changed, 1 insertions, 1 deletions
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[] = {