diff options
| author | Richard Weinberger <richard@nod.at> | 2019-09-15 23:00:10 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2019-09-15 23:00:10 +0200 |
| commit | c3c1acaf0362524d9c3c2a0afb70bc506a2cb696 (patch) | |
| tree | f7dea01b51a07802e7f4a527384f9e0b8a500f42 /drivers/mtd/nand/onenand | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
| parent | f480b969448ee3896f55ef6d037ad4a2df3914bf (diff) | |
Merge tag 'nand/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/for-5.4
NAND core
* Fixing typos
* Adding missing of_node_put() in various drivers
Raw NAND controller drivers:
* Macronix: new controller driver
* Omap2: Fixing the number of bitflips returned
* Brcmnand: Fix a pointer not iterating over all the page chunks
* W90x900: Driver removed
* Onenand: Fix a memory leak
* Sharpsl: Missing include guard
* STM32: Avoid warnings when building with W=1
* Ingenic: Fix a coccinelle warning
* r852: Call a helper to simplify the code
Diffstat (limited to 'drivers/mtd/nand/onenand')
| -rw-r--r-- | drivers/mtd/nand/onenand/onenand_base.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/onenand/onenand_base.c b/drivers/mtd/nand/onenand/onenand_base.c index e082d632fb74..77bd32a683e1 100644 --- a/drivers/mtd/nand/onenand/onenand_base.c +++ b/drivers/mtd/nand/onenand/onenand_base.c @@ -3880,6 +3880,9 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) if (!this->oob_buf) { if (this->options & ONENAND_PAGEBUF_ALLOC) { this->options &= ~ONENAND_PAGEBUF_ALLOC; +#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE + kfree(this->verify_buf); +#endif kfree(this->page_buf); } return -ENOMEM; |