diff options
| author | Adrian Hunter <[ext-adrian.hunter@nokia.com]> | 2007-01-22 09:01:01 +0100 |
|---|---|---|
| committer | Kyungmin Park <kyungmin.park@samsung.com> | 2007-01-22 13:27:56 +0100 |
| commit | f00b0046d2eafac3e78e8def9374c7492820a9d2 (patch) | |
| tree | ddcbbacccff7f64fdac41cdfe91a07b6aca20aca | |
| parent | [MTD] OneNAND: Update copyrights and code cleanup (diff) | |
| download | linux-f00b0046d2eafac3e78e8def9374c7492820a9d2.tar.xz linux-f00b0046d2eafac3e78e8def9374c7492820a9d2.zip | |
[MTD] OneNAND: Free the bad block table when the device is released
OneNAND does 2 memory allocations for bad block information.
Only one of them was being freed.
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| -rw-r--r-- | drivers/mtd/onenand/onenand_base.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_bbt.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 0ade23749ee1..0249b4aa0976 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -2133,8 +2133,11 @@ void onenand_release(struct mtd_info *mtd) del_mtd_device (mtd); /* Free bad block table memory, if allocated */ - if (this->bbm) + if (this->bbm) { + struct bbm_info *bbm = this->bbm; + kfree(bbm->bbt); kfree(this->bbm); + } /* Buffer allocated by onenand_scan */ if (this->options & ONENAND_PAGEBUF_ALLOC) kfree(this->page_buf); diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index 98f8fd1c6375..90db8f5b1f84 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c @@ -168,8 +168,8 @@ static int onenand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt) * marked good / bad blocks and writes the bad block table(s) to * the selected place. * - * The bad block table memory is allocated here. It must be freed - * by calling the onenand_free_bbt function. + * The bad block table memory is allocated here. It is freed + * by the onenand_release function. * */ int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd) |