diff options
| author | Tomas Vanek <vanekt@fbl.cz> | 2019-12-20 23:23:26 +0100 |
|---|---|---|
| committer | Tomas Vanek <vanekt@fbl.cz> | 2020-03-07 15:28:53 +0000 |
| commit | e1051e1090d4dce0e45d428345015af285a21d7e (patch) | |
| tree | 8b9abf6c4330901ba1655afeb8a340e05fc61234 /src/flash | |
| parent | b8524295002076a3f0e9e2211298a69a6ba9d858 (diff) | |
| download | riscv-openocd-e1051e1090d4dce0e45d428345015af285a21d7e.zip riscv-openocd-e1051e1090d4dce0e45d428345015af285a21d7e.tar.gz riscv-openocd-e1051e1090d4dce0e45d428345015af285a21d7e.tar.bz2 | |
flash/nor/fm4,tms470: fix clang static analyzer warnings
Change-Id: I18c1501918d40453fea6aeeb6f035e46d41fc524
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/5366
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/nor/fm4.c | 8 | ||||
| -rw-r--r-- | src/flash/nor/tms470.c | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/flash/nor/fm4.c b/src/flash/nor/fm4.c index a8877b4..7e3a1c5 100644 --- a/src/flash/nor/fm4.c +++ b/src/flash/nor/fm4.c @@ -207,7 +207,7 @@ static int fm4_flash_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t halfword_count = DIV_ROUND_UP(byte_count, 2); uint32_t result; unsigned i; - int retval; + int retval, retval2 = ERROR_OK; const uint8_t write_block_code[] = { #include "../../../contrib/loaders/flash/fm4/write.inc" }; @@ -327,7 +327,7 @@ static int fm4_flash_write(struct flash_bank *bank, const uint8_t *buffer, err_run_ret: err_run: err_write_data: - retval = fm4_enter_flash_cpu_rom_mode(target); + retval2 = fm4_enter_flash_cpu_rom_mode(target); err_flash_mode: for (i = 0; i < ARRAY_SIZE(reg_params); i++) @@ -338,7 +338,9 @@ err_alloc_data: err_write_code: target_free_working_area(target, code_workarea); - return retval; + if (retval != ERROR_OK) + return retval; + return retval2; } static int mb9bf_probe(struct flash_bank *bank) diff --git a/src/flash/nor/tms470.c b/src/flash/nor/tms470.c index 90557b8..bc16aca 100644 --- a/src/flash/nor/tms470.c +++ b/src/flash/nor/tms470.c @@ -709,6 +709,7 @@ static int tms470_erase_sector(struct flash_bank *bank, int sector) * Select one or more bits in FMBSEA or FMBSEB to disable Level 1 * protection for the particular sector to be erased/written. */ + assert(sector >= 0); if (sector < 16) { target_read_u32(target, 0xFFE88008, &fmbsea); target_write_u32(target, 0xFFE88008, fmbsea | (1 << sector)); |