summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMikael Larsson <mikael.xt.larsson@stericsson.com>2010-11-10 15:29:37 +0100
committerMichael BRANDT <michael.brandt@stericsson.com>2010-11-11 19:23:44 +0100
commite0269f4ccade16581df37ca6f486131d9f8228fd (patch)
tree06751e50d314c99615cbc894a64ae3003f620386 /board
parent8440992b1f4f694a22d9ca7db3410b60044c0f2d (diff)
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 <mikael.xt.larsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/8284 Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com> Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
Diffstat (limited to 'board')
-rw-r--r--board/st/u8500/itp.c9
1 files changed, 5 insertions, 4 deletions
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;