From e0269f4ccade16581df37ca6f486131d9f8228fd Mon Sep 17 00:00:00 2001 From: Mikael Larsson Date: Wed, 10 Nov 2010 15:29:37 +0100 Subject: U8500: Fix itp coverity issue This fixes a coverity issue in itp.c. ST-Ericsson ID: ER273353 Change-Id: Ifbe265567169a57d6dec940ef7593e601b9953e8 Signed-off-by: Mikael Larsson Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/8284 Reviewed-by: Michael BRANDT Reviewed-by: Sebastian RASMUSSEN --- board/st/u8500/itp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'board') diff --git a/board/st/u8500/itp.c b/board/st/u8500/itp.c index d714464e9..929dd45ec 100644 --- a/board/st/u8500/itp.c +++ b/board/st/u8500/itp.c @@ -182,7 +182,7 @@ int itp_is_itp_in_config(void) int itp_load_itp_and_modem(block_dev_desc_t *block_dev) { int retval = 0; - void (*loadaddress)(void) = NULL; + u32 loadaddress; debug("\nitp_load_itp_and_modem\n"); @@ -194,7 +194,7 @@ int itp_load_itp_and_modem(block_dev_desc_t *block_dev) if (cspsa_key & ITP_LOAD_MODEM) { if (itp_load_toc_entry(block_dev, ITP_TOC_MODEM_NAME, - (u32 *)loadaddress)) { + &loadaddress)) { retval = 1; goto exit; } @@ -208,7 +208,7 @@ int itp_load_itp_and_modem(block_dev_desc_t *block_dev) if (cspsa_key & ITP_LOAD_ITP) { if (itp_load_toc_entry(block_dev, ITP_TOC_ITP_NAME, - (u32 *)loadaddress)) { + &loadaddress)) { retval = 1; goto exit; } @@ -220,7 +220,8 @@ exit: itp_flush_issw(); if ((cspsa_key & ITP_LOAD_ITP) && !retval) - loadaddress(); /* U-boot execution will end here*/ + /* U-boot execution will end here */ + ((void (*)(void))loadaddress)(); /* Return on error */ return retval; -- cgit v1.2.3