diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-03-22 18:34:08 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-23 23:49:55 +0100 |
| commit | 41a881a8d9e7dc33b28768a8377ec67a7f8a0aae (patch) | |
| tree | b7c1d5a8a28186b8daee611a48ccc3675da1060c /target/linux/ramips/patches-4.14/0040-nand-hack.patch | |
| parent | 4a788fcf63920769be3428d5c61eaa6f09d5291a (diff) | |
| download | upstream-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/ramips/patches-4.14/0040-nand-hack.patch')
| -rw-r--r-- | target/linux/ramips/patches-4.14/0040-nand-hack.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-4.14/0040-nand-hack.patch b/target/linux/ramips/patches-4.14/0040-nand-hack.patch index 7b616eca46..ae6eed933f 100644 --- a/target/linux/ramips/patches-4.14/0040-nand-hack.patch +++ b/target/linux/ramips/patches-4.14/0040-nand-hack.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -1903,6 +1903,9 @@ static int nand_do_read_ops(struct mtd_i +@@ -1908,6 +1908,9 @@ static int nand_do_read_ops(struct mtd_i __func__, buf); read_retry: @@ -10,7 +10,7 @@ if (nand_standard_page_accessors(&chip->ecc)) chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); -@@ -1922,6 +1925,7 @@ read_retry: +@@ -1927,6 +1930,7 @@ read_retry: else ret = chip->ecc.read_page(mtd, chip, bufpoi, oob_required, page); @@ -18,7 +18,7 @@ if (ret < 0) { if (use_bufpoi) /* Invalidate page cache */ -@@ -3079,8 +3083,11 @@ int nand_erase_nand(struct mtd_info *mtd +@@ -3084,8 +3088,11 @@ int nand_erase_nand(struct mtd_info *mtd (page + pages_per_block)) chip->pagebuf = -1; @@ -31,7 +31,7 @@ /* See if block erase succeeded */ if (status & NAND_STATUS_FAIL) { pr_debug("%s: failed erase, page 0x%08x\n", -@@ -4210,6 +4217,7 @@ int nand_scan_ident(struct mtd_info *mtd +@@ -4215,6 +4222,7 @@ int nand_scan_ident(struct mtd_info *mtd * cmdfunc() both expect cmd_ctrl() to be populated, * so we need to check that that's the case */ |