aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
diff options
context:
space:
mode:
authorStijn Segers <foss@volatilesystems.org>2018-03-22 18:34:08 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-23 23:49:55 +0100
commit41a881a8d9e7dc33b28768a8377ec67a7f8a0aae (patch)
treeb7c1d5a8a28186b8daee611a48ccc3675da1060c /target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
parent4a788fcf63920769be3428d5c61eaa6f09d5291a (diff)
downloadupstream-41a881a8d9e7dc33b28768a8377ec67a7f8a0aae.tar.gz
upstream-41a881a8d9e7dc33b28768a8377ec67a7f8a0aae.tar.bz2
upstream-41a881a8d9e7dc33b28768a8377ec67a7f8a0aae.zip
Kernel: bump 4.14 to 4.14.29
Right patch version this time, sorry! * Patch 180-usb-xhci-add-support-for-performing-fake-doorbell.patch had to be adjusted slightly because of upstream adapted code. * Refreshed patches. Compile-tested: ramips/mt7621, x86/64 Run-tested: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org> Tested-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch')
-rw-r--r--target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch b/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
index 67ffb19e4d..962baeb2b5 100644
--- a/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
+++ b/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
@@ -18,7 +18,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
-@@ -2989,11 +2989,17 @@ out:
+@@ -2994,11 +2994,17 @@ out:
static int single_erase(struct mtd_info *mtd, int page)
{
struct nand_chip *chip = mtd_to_nand(mtd);
@@ -37,7 +37,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
}
/**
-@@ -3077,7 +3083,7 @@ int nand_erase_nand(struct mtd_info *mtd
+@@ -3082,7 +3088,7 @@ int nand_erase_nand(struct mtd_info *mtd
status = chip->erase(mtd, page & chip->pagemask);
/* See if block erase succeeded */