Skip to content

Commit fc44d0e

Browse files
etienne-lmsjhedberg
authored andcommitted
drivers: disk: sdmmc_stm32: don't mix HAL return values and error
Ensure STM32 SDMMC driver returns proper errno values and not HAL return codes. Signed-off-by: Etienne Carriere <[email protected]>
1 parent f81b1e8 commit fc44d0e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

drivers/disk/sdmmc_stm32.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,11 @@ static int stm32_sdmmc_access_init(struct disk_info *disk)
449449

450450
static int stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv)
451451
{
452-
int err = 0;
452+
HAL_StatusTypeDef hal_ret;
453453

454454
#if STM32_SDMMC_USE_DMA
455+
int err;
456+
455457
err = stm32_sdmmc_dma_deinit(priv);
456458
if (err) {
457459
LOG_ERR("DMA deinit failed");
@@ -460,14 +462,14 @@ static int stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv)
460462
#endif
461463

462464
#if defined(CONFIG_SDMMC_STM32_EMMC)
463-
err = HAL_MMC_DeInit(&priv->hsd);
465+
hal_ret = HAL_MMC_DeInit(&priv->hsd);
464466
#else
465-
err = HAL_SD_DeInit(&priv->hsd);
467+
hal_ret = HAL_SD_DeInit(&priv->hsd);
466468
stm32_sdmmc_clock_disable(priv);
467469
#endif
468-
if (err != HAL_OK) {
470+
if (hal_ret != HAL_OK) {
469471
LOG_ERR("failed to deinit stm32_sdmmc (ErrorCode 0x%X)", priv->hsd.ErrorCode);
470-
return err;
472+
return -EIO;
471473
}
472474

473475
#if !defined(CONFIG_SDMMC_STM32_EMMC)

0 commit comments

Comments
 (0)