summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-10-02 11:45:22 -0400
committerTom Rini <trini@ti.com>2013-10-02 11:45:22 -0400
commit6297872cd5de4705b6318778261b1f3f64a34c11 (patch)
tree7159ac1b03daa6906c8609b2515e42214f3bc422 /drivers/mmc
parent0ae39166b1babbc86da4269458da9bce198bce55 (diff)
parentf04c53762962280365005c9db12ab561a18f2692 (diff)
downloadu-boot-imx-6297872cd5de4705b6318778261b1f3f64a34c11.zip
u-boot-imx-6297872cd5de4705b6318778261b1f3f64a34c11.tar.gz
u-boot-imx-6297872cd5de4705b6318778261b1f3f64a34c11.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/fsl_esdhc.c2
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;