Commit 0387b306 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

prevent exit if nand_manufacturer_init returns error because it failed to get...

prevent exit if nand_manufacturer_init returns error because it failed to get ECC info and says it does not support it. Have a look later
parent c72a2eb6
...@@ -4208,6 +4208,8 @@ ident_done: ...@@ -4208,6 +4208,8 @@ ident_done:
if (mtd->writesize > 512 && chip->cmdfunc == nand_command) if (mtd->writesize > 512 && chip->cmdfunc == nand_command)
chip->cmdfunc = nand_command_lp; chip->cmdfunc = nand_command_lp;
if (maf_id == NAND_MFR_MICRON) nandchip_micron_init(mtd, dev_id);
pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",
maf_id, dev_id); maf_id, dev_id);
...@@ -4881,8 +4883,12 @@ int nand_scan_tail(struct mtd_info *mtd) ...@@ -4881,8 +4883,12 @@ int nand_scan_tail(struct mtd_info *mtd)
chip->select_chip(mtd, 0); chip->select_chip(mtd, 0);
ret = nand_manufacturer_init(chip); ret = nand_manufacturer_init(chip);
chip->select_chip(mtd, -1); chip->select_chip(mtd, -1);
// Elphel: Ignore this error - nand_manufacturer_init() (which is micron_nand_init())
// will exit with MICRON_ON_DIE_MANDATORY.
/*
if (ret) if (ret)
goto err_free_nbuf; goto err_free_nbuf;
*/
/* Set the internal oob buffer location, just after the page data */ /* Set the internal oob buffer location, just after the page data */
chip->oob_poi = chip->buffers->databuf + mtd->writesize; chip->oob_poi = chip->buffers->databuf + mtd->writesize;
......
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