diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-23 10:49:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-23 10:49:28 -0400 |
| commit | 355d1e24f6143c4839be3c015c191421c4e9449c (patch) | |
| tree | ff68e868d404d117f3f9599740f83fd73c99c306 /drivers/mtd/altera_qspi.c | |
| parent | f055f2e5a2038002519e5b9affbf259345f4ade9 (diff) | |
| parent | b9cfd8b0911209e2ebec887e497510ee42f9e788 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-spi
- Fix mtd erase with mtdpart (Marek Behún)
- NXP fspi driver fixes (Kuldeep Singh)
Diffstat (limited to 'drivers/mtd/altera_qspi.c')
| -rw-r--r-- | drivers/mtd/altera_qspi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index 7bac599a54..d31391f36a 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -153,7 +153,6 @@ static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr) putc('\n'); instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN; instr->state = MTD_ERASE_FAILED; - mtd_erase_callback(instr); return -EIO; } flash = pdata->base + addr; @@ -177,7 +176,6 @@ static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr) writel(stat, ®s->isr); /* clear isr */ instr->fail_addr = addr; instr->state = MTD_ERASE_FAILED; - mtd_erase_callback(instr); return -EIO; } if (flash_verbose) @@ -189,7 +187,6 @@ static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr) addr += mtd->erasesize; } instr->state = MTD_ERASE_DONE; - mtd_erase_callback(instr); return 0; } |