kernel: update 3.10 to 3.10.2
[openwrt/openwrt.git] / target / linux / ramips / patches-3.10 / 0032-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
1 From 413b2ed67d8e4dc1242edb9286ea3f634d10a6ba Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Mon, 15 Jul 2013 00:38:51 +0200
4 Subject: [PATCH 32/33] mtd: fix cfi cmdset 0002 erase status check
5
6 ---
7 drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++--
8 1 file changed, 2 insertions(+), 2 deletions(-)
9
10 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
11 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
12 @@ -1957,7 +1957,7 @@ static int __xipram do_erase_chip(struct
13 chip->erase_suspended = 0;
14 }
15
16 - if (chip_ready(map, adr))
17 + if (chip_good(map, adr, map_word_ff(map)))
18 break;
19
20 if (time_after(jiffies, timeo)) {
21 @@ -2046,7 +2046,7 @@ static int __xipram do_erase_oneblock(st
22 chip->erase_suspended = 0;
23 }
24
25 - if (chip_ready(map, adr)) {
26 + if (chip_good(map, adr, map_word_ff(map))) {
27 xip_enable(map, chip, adr);
28 break;
29 }