Commit 03c668a9 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 3ab0a0f9 9df4f913
...@@ -7399,6 +7399,17 @@ W: https://www.myricom.com/support/downloads/myri10ge.html ...@@ -7399,6 +7399,17 @@ W: https://www.myricom.com/support/downloads/myri10ge.html
S: Supported S: Supported
F: drivers/net/ethernet/myricom/myri10ge/ 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) NATSEMI ETHERNET DRIVER (DP8381x)
S: Orphan S: Orphan
F: drivers/net/ethernet/natsemi/natsemi.c F: drivers/net/ethernet/natsemi/natsemi.c
......
...@@ -187,7 +187,7 @@ static int double_bit_error_detect(void *error_data, void *error_ecc, ...@@ -187,7 +187,7 @@ static int double_bit_error_detect(void *error_data, void *error_ecc,
__nand_calculate_ecc(error_data, size, calc_ecc); __nand_calculate_ecc(error_data, size, calc_ecc);
ret = __nand_correct_data(error_data, error_ecc, calc_ecc, size); 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[] = { static const struct nand_ecc_test nand_ecc_test[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment