aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/nand/nand_base.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index d4107848ec0a..77b340068c6e 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2942,7 +2942,8 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
2942 2942
2943 chip->cmdfunc(mtd, NAND_CMD_READID, 0x00, -1); 2943 chip->cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);
2944 2944
2945 for (i = 0; i < 2; i++) 2945 /* Read entire ID string */
2946 for (i = 0; i < 8; i++)
2946 id_data[i] = chip->read_byte(mtd); 2947 id_data[i] = chip->read_byte(mtd);
2947 2948
2948 if (id_data[0] != *maf_id || id_data[1] != *dev_id) { 2949 if (id_data[0] != *maf_id || id_data[1] != *dev_id) {
@@ -2966,13 +2967,6 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
2966 goto ident_done; 2967 goto ident_done;
2967 } 2968 }
2968 2969
2969 chip->cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);
2970
2971 /* Read entire ID string */
2972
2973 for (i = 0; i < 8; i++)
2974 id_data[i] = chip->read_byte(mtd);
2975
2976 if (!type->name) 2970 if (!type->name)
2977 return ERR_PTR(-ENODEV); 2971 return ERR_PTR(-ENODEV);
2978 2972