diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-05-02 11:24:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-05-02 11:24:39 +1000 |
| commit | 73c3001d43e7540fa0bc3862657b269e657562c7 (patch) | |
| tree | ea36da5edbb98333fc474c90f01265904cf281fe | |
| parent | e007d123691ffd0b4e5d188aba356480345b6960 (diff) | |
| parent | 6819db94e1cd3ce24a432f3616cd563ed0c4eaba (diff) | |
| download | linux-next-history-73c3001d43e7540fa0bc3862657b269e657562c7.tar.gz | |
Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
| -rw-r--r-- | drivers/mtd/nand/raw/davinci_nand.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/nand_hynix.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index e75d81cf8c211f..051deea768dbb7 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -671,8 +671,11 @@ static int davinci_nand_exec_instr(struct davinci_nand_info *info, break; } - if (instr->delay_ns) + if (instr->delay_ns) { + /* Dummy read to be sure that command is sent before ndelay starts */ + davinci_nand_readl(info, 0); ndelay(instr->delay_ns); + } return 0; } diff --git a/drivers/mtd/nand/raw/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c index a74e64e0cfa323..c02e50608816a2 100644 --- a/drivers/mtd/nand/raw/nand_hynix.c +++ b/drivers/mtd/nand/raw/nand_hynix.c @@ -401,7 +401,7 @@ static int hynix_nand_rr_init(struct nand_chip *chip) if (ret) pr_warn("failed to initialize read-retry infrastructure"); - return 0; + return ret; } static void hynix_nand_extract_oobsize(struct nand_chip *chip, |