From 5c5af2467b4c554b5d9c75dfdb2c07d0e066a79b Mon Sep 17 00:00:00 2001 From: Fredrik Hederstierna Date: Wed, 29 Feb 2012 10:16:27 +0000 Subject: flash: Additional check for NULL in str9xpec enable_turbo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifde8783b27c64e4a4bbea180cfa2c86f6a9fe49a Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/496 Tested-by: jenkins Reviewed-by: Øyvind Harboe --- src/flash/nor/str9xpec.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/flash/nor/str9xpec.c b/src/flash/nor/str9xpec.c index e89ecf49..08d97a04 100644 --- a/src/flash/nor/str9xpec.c +++ b/src/flash/nor/str9xpec.c @@ -199,7 +199,6 @@ static int str9xpec_read_config(struct flash_bank *bank) field.out_value = NULL; field.in_value = str9xpec_info->options; - jtag_add_dr_scan(tap, 1, &field, TAP_IDLE); jtag_execute_queue(); @@ -1050,20 +1049,24 @@ COMMAND_HANDLER(str9xpec_handle_flash_enable_turbo_command) str9xpec_info = bank->driver_priv; - tap0 = str9xpec_info->tap; - /* remove arm core from chain - enter turbo mode */ + tap0 = str9xpec_info->tap; + if (tap0 == NULL) { + /* things are *WRONG* */ + command_print(CMD_CTX, "**STR9FLASH** (tap0) invalid chain?"); + return ERROR_FAIL; + } tap1 = tap0->next_tap; if (tap1 == NULL) { /* things are *WRONG* */ command_print(CMD_CTX, "**STR9FLASH** (tap1) invalid chain?"); - return ERROR_OK; + return ERROR_FAIL; } tap2 = tap1->next_tap; if (tap2 == NULL) { /* things are *WRONG* */ command_print(CMD_CTX, "**STR9FLASH** (tap2) invalid chain?"); - return ERROR_OK; + return ERROR_FAIL; } /* enable turbo mode - TURBO-PROG-ENABLE */ -- cgit v1.2.3-18-g5258