summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-21 16:42:58 -0200
committerStefano Babic <sbabic@denx.de>2014-11-24 12:10:18 +0100
commite7eb277dced570f177d75d56f40219d9dc599ed1 (patch)
tree2382aa2847e8e5777c63d935f7a773c7f6cb1314 /board
parent612f2dc026548466adf55268b9faaea108b15ec8 (diff)
downloadu-boot-imx-e7eb277dced570f177d75d56f40219d9dc599ed1.zip
u-boot-imx-e7eb277dced570f177d75d56f40219d9dc599ed1.tar.gz
u-boot-imx-e7eb277dced570f177d75d56f40219d9dc599ed1.tar.bz2
mx6boards: Fix error handling in board_mmc_init()
When an invalid USDHC port is passed we should return -EINVAL instead of 0. Also, return the error immediately on fsl_esdhc_initialize() failure. Cc: Eric Benard <eric@eukrea.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'board')
-rw-r--r--board/embest/mx6boards/mx6boards.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 02fb3fa..f8c7468 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -216,7 +216,7 @@ int board_mmc_getcd(struct mmc *mmc)
int board_mmc_init(bd_t *bis)
{
- s32 status = 0;
+ int ret;
int i;
/*
@@ -268,13 +268,15 @@ int board_mmc_init(bd_t *bis)
printf("Warning: you configured more USDHC controllers"
"(%d) then supported by the board (%d)\n",
i + 1, CONFIG_SYS_FSL_USDHC_NUM);
- return status;
+ return -EINVAL;
}
- status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+ ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+ if (ret)
+ return ret;
}
- return status;
+ return 0;
}
#endif