diff options
| author | Marek Behún <marek.behun@nic.cz> | 2021-10-05 16:55:57 +0300 |
|---|---|---|
| committer | Jagan Teki <jagan@amarulasolutions.com> | 2021-10-23 13:17:33 +0300 |
| commit | 36384f612da992ab485c4b7cd768a89e8c3fe8cf (patch) | |
| tree | ef7113f861329df7cc75674e6d5f48a28c51588c /drivers/mtd | |
| parent | e66c6f10272cba050068017081b0996a9fa8b786 (diff) | |
| download | u-boot-36384f612da992ab485c4b7cd768a89e8c3fe8cf.tar.xz | |
mtd: spi-nor-core: Try cleaning up in case writing BAR failed
Use the cleanup codepath of spi_nor_erase() also in the event of failure
of writing the BAR register.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
Tested-by: Masami Hiramatsu <masami.hiramatsu@linaro.org>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi/spi-nor-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 7572be5e34..6da7dc3a25 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -929,7 +929,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) #ifdef CONFIG_SPI_FLASH_BAR ret = write_bar(nor, addr); if (ret < 0) - return ret; + goto erase_err; #endif write_enable(nor); |