kernel: update 3.14 to 3.14.18
[openwrt.git] / target / linux / ramips / patches-3.14 / 0041-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
1 From f0df443ca7d5d0e4d31aa6769ea12a8cf24d2cd8 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 41/57] 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                 }