diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-02 14:48:27 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-02 14:48:27 +0000 |
| commit | 02a5ad45837c2d3eddb811d174f45276da9d79e2 (patch) | |
| tree | 7e2c41d7c11127f5a8b6a4f1d17c0f15b29e5b9c /target/linux/ramips/patches-4.3/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch | |
| parent | 0ca1a3bc4a0e077f45061d22b6de3ead217da627 (diff) | |
| download | master-187ad058-02a5ad45837c2d3eddb811d174f45276da9d79e2.tar.gz master-187ad058-02a5ad45837c2d3eddb811d174f45276da9d79e2.tar.bz2 master-187ad058-02a5ad45837c2d3eddb811d174f45276da9d79e2.zip | |
ramips: clean up and refresh kernel patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48070 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-4.3/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch')
| -rw-r--r-- | target/linux/ramips/patches-4.3/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/ramips/patches-4.3/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch b/target/linux/ramips/patches-4.3/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch index 635f60475a..b6189fe096 100644 --- a/target/linux/ramips/patches-4.3/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch +++ b/target/linux/ramips/patches-4.3/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch @@ -7,11 +7,9 @@ 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(-) -diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c -index c3624eb..60d960a 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -2290,7 +2290,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip) +@@ -2291,7 +2291,7 @@ static int __xipram do_erase_chip(struct chip->erase_suspended = 0; } @@ -20,7 +18,7 @@ index c3624eb..60d960a 100644 break; if (time_after(jiffies, timeo)) { -@@ -2379,7 +2379,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, +@@ -2380,7 +2380,7 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -29,6 +27,3 @@ index c3624eb..60d960a 100644 xip_enable(map, chip, adr); break; } --- -1.7.10.4 - |