aboutsummaryrefslogtreecommitdiff
path: root/src/flash/nor/fespi.c
diff options
context:
space:
mode:
authorTomas Vanek <vanekt@fbl.cz>2021-11-18 09:37:23 +0100
committerAntonio Borneo <borneo.antonio@gmail.com>2021-12-03 21:59:20 +0000
commitf735faa9319af324b94e4257444419c8dfec6592 (patch)
tree1d42acd12cc96d37e19b278d17926c6f2e1e98c3 /src/flash/nor/fespi.c
parent35f284fe7c51d29768156cfec172152d2539d98a (diff)
downloadriscv-openocd-f735faa9319af324b94e4257444419c8dfec6592.zip
riscv-openocd-f735faa9319af324b94e4257444419c8dfec6592.tar.gz
riscv-openocd-f735faa9319af324b94e4257444419c8dfec6592.tar.bz2
target,flash: allow target_free_working_area on NULL area pointer
Standard C library free() allows NULL pointer as a parameter. Change target_free_working_area() to conform this convention. Remove NULL pointer tests before target_free_working_area() calls. While on it add missing setting pointer to NULL after target_free_working_area(). Change-Id: I7c692ab04a9933398ba5bc614723ad0bdecb87b3 Signed-off-by: Tomas Vanek <vanekt@fbl.cz> Reviewed-on: https://review.openocd.org/c/openocd/+/6712 Tested-by: jenkins Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Diffstat (limited to 'src/flash/nor/fespi.c')
-rw-r--r--src/flash/nor/fespi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/flash/nor/fespi.c b/src/flash/nor/fespi.c
index 11da818..5474ffa 100644
--- a/src/flash/nor/fespi.c
+++ b/src/flash/nor/fespi.c
@@ -661,10 +661,8 @@ static int fespi_write(struct flash_bank *bank, const uint8_t *buffer,
return ERROR_OK;
err:
- if (algorithm_wa) {
- target_free_working_area(target, data_wa);
- target_free_working_area(target, algorithm_wa);
- }
+ target_free_working_area(target, data_wa);
+ target_free_working_area(target, algorithm_wa);
/* Switch to HW mode before return to prompt */
if (fespi_enable_hw_mode(bank) != ERROR_OK)