diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-19 07:21:43 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-19 07:21:43 +1200 |
| commit | 3cdf680ea14d8bd3460894eaae0a8bd6a048f705 (patch) | |
| tree | df0ab66bee3fb335b8ff6fedeed0303fa71fdd8b /drivers/mtd/nand/raw/denali.c | |
| parent | 6e4673b42e68c78e449f3f6bfe64ff615c90d0f0 (diff) | |
| parent | d311e0c27b8fcc27f707f8cac48cd8bdc4155224 (diff) | |
| download | linux-3cdf680ea14d8bd3460894eaae0a8bd6a048f705.tar.gz linux-3cdf680ea14d8bd3460894eaae0a8bd6a048f705.tar.bz2 linux-3cdf680ea14d8bd3460894eaae0a8bd6a048f705.zip | |
Merge tag 'mtd/fixes-for-5.0-rc3' of git://git.infradead.org/linux-mtd
Pull mtd fixes from Boris Brezillon:
"Raw NAND changes:
- jz4740: fix a compilation warning
- fsmc: fix a regression introduced by ->select_chip() deprecation
- denali: fix a regression introduced by NAND_KEEP_TIMINGS addition"
* tag 'mtd/fixes-for-5.0-rc3' of git://git.infradead.org/linux-mtd:
mtd: rawnand: denali: get ->setup_data_interface() working again
mtd: nand: jz4740: fix '__iomem *' vs. '* __iomem'
mtd: rawnand: fsmc: Keep bank enable bit set
Diffstat (limited to 'drivers/mtd/nand/raw/denali.c')
| -rw-r--r-- | drivers/mtd/nand/raw/denali.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index eebac35304c6..6e8edc9375dd 100644 --- a/drivers/mtd/nand/raw/denali.c +++ b/drivers/mtd/nand/raw/denali.c @@ -1322,7 +1322,7 @@ int denali_init(struct denali_nand_info *denali) } /* clk rate info is needed for setup_data_interface */ - if (denali->clk_rate && denali->clk_x_rate) + if (!denali->clk_rate || !denali->clk_x_rate) chip->options |= NAND_KEEP_TIMINGS; chip->legacy.dummy_controller.ops = &denali_controller_ops; |