Merge tag 'mmc-power-next-2025-09-24' of https://source.denx.de/u-boot/custodians/u-boot-mmc into next

CI: https://source.denx.de/u-boot/custodians/u-boot-mmc/-/pipelines/27712

- Correct error value check in regulator_list_autoset
- Minor style fixes in mmc
This commit is contained in:
Tom Rini
2025-09-24 09:28:58 -06:00
2 changed files with 3 additions and 4 deletions

View File

@@ -104,8 +104,7 @@ __weak int board_mmc_getcd(struct mmc *mmc)
return -1;
}
#endif
#ifdef CONFIG_MMC_TRACE
#if IS_ENABLED(CONFIG_MMC_TRACE)
void mmmc_trace_before_send(struct mmc *mmc, struct mmc_cmd *cmd)
{
printf("CMD_SEND:%d\n", cmd->cmdidx);
@@ -3190,7 +3189,7 @@ static int mmc_probe(struct bd_info *bis)
int mmc_initialize(struct bd_info *bis)
{
static int initialized = 0;
static int initialized;
int ret;
if (initialized) /* Avoid initializing mmc multiple times */
return 0;

View File

@@ -389,7 +389,7 @@ int regulator_list_autoset(const char *list_platname[],
ret = regulator_autoset_by_name(list_platname[i], &dev);
if (ret != -EMEDIUMTYPE && verbose)
regulator_show(dev, ret);
if (ret & !error)
if (ret && ret != -EALREADY && !error)
error = ret;
if (list_devp)