The patch titled mtd-nand: davinci: Correct 4-bit error correction has been removed from the -mm tree. Its filename was mtd-nand-davinci-correct-4-bit-error-correction-update.patch This patch was dropped because it was folded into mtd-nand-davinci-correct-4-bit-error-correction.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mtd-nand: davinci: Correct 4-bit error correction From: Sudhakar Rajashekhara <sudhakar.raj@xxxxxx> From the previous version, timeout has been added to come out of the infinite loop. Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@xxxxxx> Cc: Sneha Narnakaje <nsnehaprabha@xxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mtd/nand/davinci_nand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/mtd/nand/davinci_nand.c~mtd-nand-davinci-correct-4-bit-error-correction-update drivers/mtd/nand/davinci_nand.c --- a/drivers/mtd/nand/davinci_nand.c~mtd-nand-davinci-correct-4-bit-error-correction-update +++ a/drivers/mtd/nand/davinci_nand.c @@ -312,6 +312,7 @@ static int nand_davinci_correct_4bit(str u32 syndrome[4]; u32 ecc_state; unsigned num_errors, corrected; + unsigned long timeo = jiffies + msecs_to_jiffies(100); /* All bytes 0xff? It's an erased page; ignore its ECC. */ for (i = 0; i < 10; i++) { @@ -374,7 +375,7 @@ compare: ecc_state = (davinci_nand_readl(info, NANDFSR_OFFSET) >> 8) & 0x0f; cpu_relax(); - } while (ecc_state < 4); + } while ((ecc_state < 4) && time_before(jiffies, timeo)); for (;;) { u32 fsr = davinci_nand_readl(info, NANDFSR_OFFSET); _ Patches currently in -mm which might be from sudhakar.raj@xxxxxx are mtd-nand-davinci-correct-4-bit-error-correction.patch mtd-nand-davinci-correct-4-bit-error-correction-update.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html