diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-09-03 01:04:16 +0300 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-09-03 01:04:16 +0300 |
| commit | c1fe77e42440d2cad76055df6fb58caabf622d51 (patch) | |
| tree | ac61d6979fbf5f2cf50bf00922a2cd29320f080c /drivers/mtd/nand/raw/meson_nand.c | |
| parent | ee28b42006c37aaeb68c83300fe5608db662082f (diff) | |
| parent | 6b430c7595e4eb95fae8fb54adc3c3ce002e75ae (diff) | |
| download | linux-c1fe77e42440d2cad76055df6fb58caabf622d51.tar.xz | |
Merge tag 'nand/for-5.15' into mtd/next
NAND core changes:
* Repair Miquel Raynal's email address in MAINTAINERS
* Fix a couple of spelling mistakes in Kconfig
* bbt: Skip bad blocks when searching for the BBT in NAND
* Remove never changed ret variable
Raw NAND changes:
* cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()'
* intel: Fix error handling in probe
* omap: Fix kernel doc warning on 'calcuate' typo
* gpmc: Fix the ECC bytes vs. OOB bytes equation
SPI-NAND core changes:
* Properly fill the OOB area.
* Fix comment
SPI-NAND drivers changes:
* macronix: Add Quad support for serial NAND flash
Diffstat (limited to 'drivers/mtd/nand/raw/meson_nand.c')
| -rw-r--r-- | drivers/mtd/nand/raw/meson_nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 817bddccb775..ac3be92872d0 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -580,7 +580,7 @@ static int meson_nfc_rw_cmd_prepare_and_execute(struct nand_chip *nand, u32 *addrs = nfc->cmdfifo.rw.addrs; u32 cs = nfc->param.chip_select; u32 cmd0, cmd_num, row_start; - int ret = 0, i; + int i; cmd_num = sizeof(struct nand_rw_cmd) / sizeof(int); @@ -620,7 +620,7 @@ static int meson_nfc_rw_cmd_prepare_and_execute(struct nand_chip *nand, meson_nfc_cmd_idle(nfc, nfc->timing.tadl); } - return ret; + return 0; } static int meson_nfc_write_page_sub(struct nand_chip *nand, |