diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 14:53:27 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 14:53:27 +0200 |
commit | f04c53762962280365005c9db12ab561a18f2692 (patch) | |
tree | 6cd2fa04929473afda1cceaa297cd340792bd326 /drivers/mmc | |
parent | 5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4 (diff) | |
parent | ce7a7f5e6bda35d7d0972be07b6983552d1a2cb2 (diff) | |
download | u-boot-imx-f04c53762962280365005c9db12ab561a18f2692.zip u-boot-imx-f04c53762962280365005c9db12ab561a18f2692.tar.gz u-boot-imx-f04c53762962280365005c9db12ab561a18f2692.tar.bz2 |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/fsl_esdhc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index f87e647..a7170b4 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -518,6 +518,8 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) return -1; mmc = malloc(sizeof(struct mmc)); + if (!mmc) + return -ENOMEM; sprintf(mmc->name, "FSL_SDHC"); regs = (struct fsl_esdhc *)cfg->esdhc_base; |