From: Paul Fertser Date: Wed, 17 Jan 2018 21:07:29 +0000 (+0300) Subject: flash: nor: stm32l4x: fix warning in probe X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e3a5f1613bcceb4508917a7f79348167503effab;p=openocd flash: nor: stm32l4x: fix warning in probe Reading options word can fail, so this needs to be handled. Reported by Clang static analyzer. Change-Id: I9754cab9c4446fa2b20d4b44b0e20724d1bc1beb Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/4352 Tested-by: jenkins Reviewed-by: Tim "mithro" Ansell Reviewed-by: Tomas Vanek --- diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c index fa0c48b4..6a1fa074 100644 --- a/src/flash/nor/stm32l4x.c +++ b/src/flash/nor/stm32l4x.c @@ -652,6 +652,9 @@ static int stm32l4_probe(struct flash_bank *bank) /* get options to for DUAL BANK. */ retval = target_read_u32(target, STM32_FLASH_OPTR, &options); + if (retval != ERROR_OK) + return retval; + /* only devices with < 1024 kiB may be set to single bank dual banks */ if ((flash_size_in_kb == 1024) || !(options & OPT_DUALBANK)) stm32l4_info->option_bytes.bank_b_start = 256;