]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
spl: mmc: Fix subsequent calls to spl_mmc_load with CONFIG_BLK
authorSean Anderson <seanga2@gmail.com>
Sun, 8 Oct 2023 01:47:48 +0000 (21:47 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 18 Oct 2023 00:50:52 +0000 (20:50 -0400)
MMC devices do not have uclass platdata containing blk_descs, only their
child block devices do. Fortunately, we have a function just for this
purpose. This fixes subsequent calls to spl_mmc_load.

Fixes: bf28d9a6599 ("spl: mmc: Use correct MMC device when loading image")
Signed-off-by: Sean Anderson <seanga2@gmail.com>
common/spl/spl_mmc.c

index 0ab85d2168c19b6a984bc6defc80392f700be0ea..02ad32a23e018d9db935848a9dc9ab67f45a537c 100644 (file)
@@ -396,7 +396,7 @@ static int spl_mmc_get_mmc_devnum(struct mmc *mmc)
 #if !CONFIG_IS_ENABLED(BLK)
        block_dev = &mmc->block_dev;
 #else
-       block_dev = dev_get_uclass_plat(mmc->dev);
+       block_dev = mmc_get_blk_desc(mmc);
 #endif
        return block_dev->devnum;
 }