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

Commit 963d1c28 authored by Huang Shijie's avatar Huang Shijie Committed by Brian Norris
Browse files

mtd: nand: fix the wrong mtd->type for nand chip 



Current code sets the mtd->type with MTD_NANDFLASH for both
SLC and MLC. So the jffs2 may supports the MLC nand, but in actually,
the jffs2 should not support the MLC.

This patch uses the nand_is_slc() to check the nand cell type,
and set the mtd->type with the right nand type.

After this patch, the jffs2 only supports the SLC nand.

The side-effect of this patch:
  Before this patch, the ioctl(MEMGETINFO) can only return with the
  MTD_NANDFLASH; but after this patch, the ioctl(MEMGETINFO) will
  return with the MTD_NANDFLASH for SLC, and MTD_MLCNANDFLASH for MLC.

  So the user applictions(such as mtd-utils) should also changes a little
  for this.

Signed-off-by: default avatarHuang Shijie <b32955@freescale.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent e104f1e9

drivers/mtd/nand/nand_base.c

+1 −1
Original line number Diff line number Diff line
@@ -3785,7 +3785,7 @@ int nand_scan_tail(struct mtd_info *mtd) 
		chip->options |= NAND_SUBPAGE_READ;



	/* Fill in remaining MTD driver data */

	mtd->type = MTD_NANDFLASH;

	mtd->type = nand_is_slc(chip) ? MTD_NANDFLASH : MTD_MLCNANDFLASH;

	mtd->flags = (chip->options & NAND_ROM) ? MTD_CAP_ROM :

						MTD_CAP_NANDFLASH;

	mtd->_erase = nand_erase;