mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
e2aa0c3f8b
Refreshed all patches Dropped upstreamed patches: 522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch 523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch 525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch 527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch updated patches: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch 030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch Added new ARM64 symbol: CONFIG_ARM64_ERRATUM_1024718 Compile-tested on: cns3xxx, imx6, mvebu (arm64), x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
30 lines
858 B
Diff
30 lines
858 B
Diff
From 8e72a3a1be8f6328bd7ef491332ba541547b6086 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Mon, 15 Jul 2013 00:38:51 +0200
|
|
Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check
|
|
|
|
---
|
|
drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
@@ -2295,7 +2295,7 @@ static int __xipram do_erase_chip(struct
|
|
chip->erase_suspended = 0;
|
|
}
|
|
|
|
- if (chip_ready(map, adr))
|
|
+ if (chip_good(map, adr, map_word_ff(map)))
|
|
break;
|
|
|
|
if (time_after(jiffies, timeo)) {
|
|
@@ -2385,7 +2385,7 @@ static int __xipram do_erase_oneblock(st
|
|
chip->erase_suspended = 0;
|
|
}
|
|
|
|
- if (chip_ready(map, adr)) {
|
|
+ if (chip_good(map, adr, map_word_ff(map))) {
|
|
xip_enable(map, chip, adr);
|
|
break;
|
|
}
|