diff options
| author | Łukasz Majewski <l.majewski@samsung.com> | 2012-04-19 02:39:18 +0000 |
|---|---|---|
| committer | Andy Fleming <afleming@freescale.com> | 2012-07-13 17:04:50 -0500 |
| commit | 40242bc394030871e6de13883fe1ace5c0b8e15b (patch) | |
| tree | 15b363efb1a2c162af82fb0eb8c105ec6a0a0891 /drivers/mmc/mmc.c | |
| parent | ad5fd92289a0721eb8a4f6c648e67f45915812cd (diff) | |
| download | u-boot-imx-40242bc394030871e6de13883fe1ace5c0b8e15b.zip u-boot-imx-40242bc394030871e6de13883fe1ace5c0b8e15b.tar.gz u-boot-imx-40242bc394030871e6de13883fe1ace5c0b8e15b.tar.bz2 | |
mmc:fix Call mmc_init() when executing mmc_get_dev()
This code adds call to mmc_init(), for partition related commands (e.g.
fatls, fatinfo etc.).
It is safe to call mmc_init() multiple times since mmc->has_init flag
prevents from multiple initialization.
The FAT related code calls get_dev high level method and then uses
elements from mmc->block_dev, which is uninitialized until the mmc_init
(and thereof mmc_startup) is called.
This problem appears on boards, which don't use mmc as the default
place for envs
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Andy Fleming <afleming@gmail.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 9f746a3..98e5af3 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1306,8 +1306,11 @@ int mmc_register(struct mmc *mmc) block_dev_desc_t *mmc_get_dev(int dev) { struct mmc *mmc = find_mmc_device(dev); + if (!mmc) + return NULL; - return mmc ? &mmc->block_dev : NULL; + mmc_init(mmc); + return &mmc->block_dev; } #endif |