From a0733b3c66fceba34e5fad2c84ccbfa79ede00f3 Mon Sep 17 00:00:00 2001 From: Sean Anderson Date: Sat, 7 Oct 2023 21:47:48 -0400 Subject: [PATCH] spl: mmc: Fix subsequent calls to spl_mmc_load with CONFIG_BLK 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 --- common/spl/spl_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 0ab85d2168..02ad32a23e 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -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; } -- 2.39.5