mx53evk: 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.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
This commit is contained in:
Fabio Estevam 2014-11-20 16:35:19 -02:00 committed by Stefano Babic
parent c5ba77ac05
commit 1abd714de2
1 changed files with 6 additions and 4 deletions

View File

@ -195,7 +195,7 @@ int board_mmc_init(bd_t *bis)
};
u32 index;
s32 status = 0;
int ret;
esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
@ -214,12 +214,14 @@ int board_mmc_init(bd_t *bis)
printf("Warning: you configured more ESDHC controller"
"(%d) as supported by the board(2)\n",
CONFIG_SYS_FSL_ESDHC_NUM);
return status;
return -EINVAL;
}
status |= fsl_esdhc_initialize(bis, &esdhc_cfg[index]);
ret = fsl_esdhc_initialize(bis, &esdhc_cfg[index]);
if (ret)
return ret;
}
return status;
return 0;
}
#endif