aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
diff options
context:
space:
mode:
authorEtienne Haarsma <bladeoner112@gmail.com>2018-05-05 18:50:42 +0200
committerJohn Crispin <john@phrozen.org>2018-05-07 07:58:33 +0200
commite8b1af45f8b2883e76f5d491c2fda2fca20c5634 (patch)
treed681b02c5305d30e79f0af0f986e6407e9d39c69 /target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
parent999bb66b20b03c753801ecebf1ec2a03c6a63c96 (diff)
downloadupstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.tar.gz
upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.tar.bz2
upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.zip
kernel: bump kernel 4.4 to 4.4.131 for 17.01
* Refreshed patches Compile-tested: ar71xx Run-tested: ar71xx Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
Diffstat (limited to 'target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch')
-rw-r--r--target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch b/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
index b6189fe096..1bcad6d2bd 100644
--- a/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
+++ b/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -2291,7 +2291,7 @@ static int __xipram do_erase_chip(struct
+@@ -2293,7 +2293,7 @@ static int __xipram do_erase_chip(struct
chip->erase_suspended = 0;
}
@@ -18,7 +18,7 @@ Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check
break;
if (time_after(jiffies, timeo)) {
-@@ -2380,7 +2380,7 @@ static int __xipram do_erase_oneblock(st
+@@ -2383,7 +2383,7 @@ static int __xipram do_erase_oneblock(st
chip->erase_suspended = 0;
}