Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mtd/fixes-for-4.16' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Boris Brezillon:
"Two fixes, one in the atmel NAND driver and another one in the
CFI/JEDEC code.
Summary:
- Fix a bug in Atmel ECC engine driver
- Fix a bug in the CFI/JEDEC driver"
* tag 'mtd/fixes-for-4.16' of git://git.infradead.org/linux-mtd:
mtd: jedec_probe: Fix crash in jedec_read_mfr()
mtd: nand: atmel: Fix get_sectorsize() function
+3
-1
+2
drivers/mtd/chips/jedec_probe.c
+2
drivers/mtd/chips/jedec_probe.c
···
1889
1889
do {
1890
1890
uint32_t ofs = cfi_build_cmd_addr(0 + (bank << 8), map, cfi);
1891
1891
mask = (1 << (cfi->device_type * 8)) - 1;
1892
+
if (ofs >= map->size)
1893
+
return 0;
1892
1894
result = map_read(map, base + ofs);
1893
1895
bank++;
1894
1896
} while ((result.x[0] & mask) == CFI_MFR_CONTINUATION);
+1
-1
drivers/mtd/nand/atmel/pmecc.c
+1
-1
drivers/mtd/nand/atmel/pmecc.c
···
426
426
427
427
static int get_sectorsize(struct atmel_pmecc_user *user)
428
428
{
429
-
return user->cache.cfg & PMECC_LOOKUP_TABLE_SIZE_1024 ? 1024 : 512;
429
+
return user->cache.cfg & PMECC_CFG_SECTOR1024 ? 1024 : 512;
430
430
}
431
431
432
432
static void atmel_pmecc_gen_syndrome(struct atmel_pmecc_user *user, int sector)