flash: nor: stm32l4x: fix warning in probe 52/4352/2
authorPaul Fertser <fercerpav@gmail.com>
Wed, 17 Jan 2018 21:07:29 +0000 (00:07 +0300)
committerTomas Vanek <vanekt@fbl.cz>
Thu, 25 Jan 2018 07:22:57 +0000 (07:22 +0000)
Reading options word can fail, so this needs to be handled.

Reported by Clang static analyzer.

Change-Id: I9754cab9c4446fa2b20d4b44b0e20724d1bc1beb
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/4352
Tested-by: jenkins
Reviewed-by: Tim "mithro" Ansell <mithro@mithis.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
src/flash/nor/stm32l4x.c

index fa0c48b..6a1fa07 100644 (file)
@@ -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;