summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-05-17 14:50:37 +0900
committerStefan Roese <sr@denx.de>2013-05-23 09:48:45 +0200
commit24c185cf58a5bef1e0401a0f7e70526d6d9078c7 (patch)
treef0a2227c9ed6ba61ddc63342eb3c3f688e57ab9b
parente2e273a3d7e82a4dab5e5d2a1ed6a9d3b781bd54 (diff)
downloadu-boot-imx-24c185cf58a5bef1e0401a0f7e70526d6d9078c7.zip
u-boot-imx-24c185cf58a5bef1e0401a0f7e70526d6d9078c7.tar.gz
u-boot-imx-24c185cf58a5bef1e0401a0f7e70526d6d9078c7.tar.bz2
cfi_flash: return NULL for invalid base address input
When base address given was out of valid flash address ranges, flash_get_info() function returned the pointer to the last element of flash_info[i] array. This patch changes this function to return NULL pointer in such a case, which is more correct behaviour. The function flash_protect_default() calls flash_protect() immediately after flash_get_info() invocation. With this correction, flash_protect() function would be able to return soon, for NULL flash_info. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--drivers/mtd/cfi_flash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 28250c2..25f8752 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -184,16 +184,16 @@ u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64")));
flash_info_t *flash_get_info(ulong base)
{
int i;
- flash_info_t *info = NULL;
+ flash_info_t *info;
for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
info = &flash_info[i];
if (info->size && info->start[0] <= base &&
base <= info->start[0] + info->size - 1)
- break;
+ return info;
}
- return info;
+ return NULL;
}
#endif