Annotation of /trunk/kernel-alx/patches-5.4/0305-5.4.206-all-fixes.patch
Parent Directory
|
Revision Log
Revision 3637 -
(hide annotations)
(download)
Mon Oct 24 12:40:44 2022 UTC (20 months ago) by niro
File size: 976 byte(s)
Mon Oct 24 12:40:44 2022 UTC (20 months ago) by niro
File size: 976 byte(s)
-add missing
1 | niro | 3637 | diff --git a/Makefile b/Makefile |
2 | index c40565492ffba..755123455105f 100644 | ||
3 | --- a/Makefile | ||
4 | +++ b/Makefile | ||
5 | @@ -1,7 +1,7 @@ | ||
6 | # SPDX-License-Identifier: GPL-2.0 | ||
7 | VERSION = 5 | ||
8 | PATCHLEVEL = 4 | ||
9 | -SUBLEVEL = 205 | ||
10 | +SUBLEVEL = 206 | ||
11 | EXTRAVERSION = | ||
12 | NAME = Kleptomaniac Octopus | ||
13 | |||
14 | diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | ||
15 | index 41f7dd58bdcf8..02218c3b548f9 100644 | ||
16 | --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | ||
17 | +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | ||
18 | @@ -682,7 +682,7 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this, | ||
19 | hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) | | ||
20 | BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) | | ||
21 | BF_GPMI_TIMING0_DATA_SETUP(data_setup_cycles); | ||
22 | - hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(DIV_ROUND_UP(busy_timeout_cycles, 4096)); | ||
23 | + hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(busy_timeout_cycles * 4096); | ||
24 | |||
25 | /* | ||
26 | * Derive NFC ideal delay from {3}: |