Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 0bb254c7d2b..33d8aad8bba 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -339,9 +339,9 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
                                     (FIR_OP_UA  << FIR_OP1_SHIFT) |
                                     (FIR_OP_RBW << FIR_OP2_SHIFT));
                 out_be32(&lbc->fcr, NAND_CMD_READID << FCR_CMD0_SHIFT);
-                /* 5 bytes for manuf, device and exts */
-                out_be32(&lbc->fbcr, 5);
-                elbc_fcm_ctrl->read_bytes = 5;
+                /* nand_get_flash_type() reads 8 bytes of entire ID string */
+                out_be32(&lbc->fbcr, 8);
+                elbc_fcm_ctrl->read_bytes = 8;
                 elbc_fcm_ctrl->use_mdr = 1;
                 elbc_fcm_ctrl->mdr = 0;