diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-23 21:15:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-23 21:15:36 +0300 |
| commit | a580657ad7dc1f4c7e98cc1450c961dccfc52aab (patch) | |
| tree | 502ccb6c1788e8b6a25871be9ebe8589db7e0d40 /include/linux | |
| parent | 935c200aa782c372619e874ed0eea4b4e9612cf3 (diff) | |
| parent | 6b00c35138b404be98b85f4a703be594cbed501c (diff) | |
| download | linux-a580657ad7dc1f4c7e98cc1450c961dccfc52aab.tar.xz | |
Merge tag 'mtd/fixes-for-4.16-rc7' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Boris Brezillon:
- Fix several problems in the fsl_ifc NAND controller driver
- Fix misuse of mtd_ooblayout_ecc() in mtdchar.c
* tag 'mtd/fixes-for-4.16-rc7' of git://git.infradead.org/linux-mtd:
mtd: nand: fsl_ifc: Read ECCSTAT0 and ECCSTAT1 registers for IFC 2.0
mtd: nand: fsl_ifc: Fix eccstat array overflow for IFC ver >= 2.0.0
mtd: nand: fsl_ifc: Fix nand waitfunc return value
mtdchar: fix usage of mtd_ooblayout_ecc()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsl_ifc.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/fsl_ifc.h b/include/linux/fsl_ifc.h index c332f0a45607..3fdfede2f0f3 100644 --- a/include/linux/fsl_ifc.h +++ b/include/linux/fsl_ifc.h @@ -734,11 +734,7 @@ struct fsl_ifc_nand { u32 res19[0x10]; __be32 nand_fsr; u32 res20; - /* The V1 nand_eccstat is actually 4 words that overlaps the - * V2 nand_eccstat. - */ - __be32 v1_nand_eccstat[2]; - __be32 v2_nand_eccstat[6]; + __be32 nand_eccstat[8]; u32 res21[0x1c]; __be32 nanndcr; u32 res22[0x2]; |