Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfe3fdad authored by Tilman Sauerbeck's avatar Tilman Sauerbeck Committed by David Woodhouse
Browse files

mtd: nand: Fix probe of Samsung NAND chips 



Apparently, the check for a 6-byte ID string introduced by commit
426c457a ("mtd: nand: extend NAND flash
detection to new MLC chips") is NOT sufficient to determine whether or
not a Samsung chip uses their new MLC detection scheme or the old,
standard scheme. This adds a condition to check cell type.

Signed-off-by: default avatarTilman Sauerbeck <tilman@code-monkey.de>
Signed-off-by: default avatarBrian Norris <norris@broadcom.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Cc: stable@kernel.org
parent 065a1ed8

drivers/mtd/nand/nand_base.c

+1 −0
Original line number Diff line number Diff line
@@ -2866,6 +2866,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 
		 */

		if (id_data[0] == id_data[6] && id_data[1] == id_data[7] &&

				id_data[0] == NAND_MFR_SAMSUNG &&

				(chip->cellinfo & NAND_CI_CELLTYPE_MSK) &&

				id_data[5] != 0x00) {

			/* Calc pagesize */

			mtd->writesize = 2048 << (extid & 0x03);