cfi: tighten up type usage a bit

[fw/openocd] / src / flash / nor / cfi.c

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 9813d83b84721220ec153d5fe2712e83c1940979..5b5b4da9a91c44cf42106ab452a616acf1412e8f 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -805,7 +805,7 @@ FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
 
        cfi_info = malloc(sizeof(struct cfi_flash_bank));
        cfi_info->probed = 0;
-       cfi_info->erase_region_info = 0;
+       cfi_info->erase_region_info = NULL;
        cfi_info->pri_ext = NULL;
        bank->driver_priv = cfi_info;
 
@@ -2494,7 +2494,8 @@ static int cfi_probe(struct flash_bank *bank)
 
                if (cfi_info->num_erase_regions)
                {
-                       cfi_info->erase_region_info = malloc(4 * cfi_info->num_erase_regions);
+                       cfi_info->erase_region_info = malloc(sizeof(*cfi_info->erase_region_info)
+                                       * cfi_info->num_erase_regions);
                        for (i = 0; i < cfi_info->num_erase_regions; i++)
                        {
                                retval = cfi_query_u32(bank, 0, 0x2d + (4 * i), &cfi_info->erase_region_info[i]);