diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-10 09:47:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-10 09:47:57 -0400 |
| commit | 75fd49c836d9a1750c9b6d86c0511b990fbe9fa8 (patch) | |
| tree | cb0e9010edb4dbc48230bf6fc031de9a101d42dd /common | |
| parent | 56491f98d48921a57d1f13e3f91556a1b87de2f8 (diff) | |
| parent | abf54bf978ed9932d69ee7f937012398d0d8d08f (diff) | |
| download | u-boot-75fd49c836d9a1750c9b6d86c0511b990fbe9fa8.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_mmc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common/env_mmc.c b/common/env_mmc.c index 404de85062..88b043ec35 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -121,7 +121,12 @@ static const char *init_mmc_for_env(struct mmc *mmc) if (!mmc) return "!No MMC card found"; -#ifndef CONFIG_BLK +#ifdef CONFIG_BLK + struct udevice *dev; + + if (blk_get_from_parent(mmc->dev, &dev)) + return "!No block device"; +#else if (mmc_init(mmc)) return "!MMC init failed"; #endif |