Commit d9b8a67b authored by Liu Jian's avatar Liu Jian Committed by Richard Weinberger

mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer

In function do_write_buffer(), in the for loop, there is a case
chip_ready() returns 1 while chip_good() returns 0, so it never
break the loop.
To fix this, chip_good() is enough and it should timeout if it stay
bad for a while.

Fixes: dfeae107("mtd: cfi_cmdset_0002: Change write buffer to check correct value")
Signed-off-by: default avatarYi Huaijie <yihuaijie@huawei.com>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
Reviewed-by: default avatarTokunori Ikegami <ikegami_to@yahoo.co.jp>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 8c2ffd91
...@@ -1876,7 +1876,11 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, ...@@ -1876,7 +1876,11 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
continue; continue;
} }
if (time_after(jiffies, timeo) && !chip_ready(map, adr)) /*
* We check "time_after" and "!chip_good" before checking "chip_good" to avoid
* the failure due to scheduling.
*/
if (time_after(jiffies, timeo) && !chip_good(map, adr, datum))
break; break;
if (chip_good(map, adr, datum)) { if (chip_good(map, adr, datum)) {
......
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