projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'clk-doc', 'clk-more-critical', 'clk-meson' and 'clk-basic-be' into...
[linux-2.6-microblaze.git]
/
drivers
/
mtd
/
chips
/
cfi_cmdset_0002.c
diff --git
a/drivers/mtd/chips/cfi_cmdset_0002.c
b/drivers/mtd/chips/cfi_cmdset_0002.c
index
72428b6
..
7b7286b
100644
(file)
--- a/
drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/
drivers/mtd/chips/cfi_cmdset_0002.c
@@
-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;
if (chip_good(map, adr, datum)) {
break;
if (chip_good(map, adr, datum)) {