diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c index 65bda1ab001..1a58ee6fbef 100644 --- a/arch/arm/src/stm32f7/stm32_sdmmc.c +++ b/arch/arm/src/stm32f7/stm32_sdmmc.c @@ -889,6 +889,7 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask, /* Save all of the data and set the new interrupt mask in one, atomic * operation. */ + flags = enter_critical_section(); #ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE @@ -1899,8 +1900,8 @@ static int stm32_sdmmc_interrupt(int irq, void *context, void *arg) #ifdef CONFIG_SDIO_MUXBUS static int stm32_lock(FAR struct sdio_dev_s *dev, bool lock) { - /* The multiplex bus is part of board support package. - */ + /* The multiplex bus is part of board support package. */ + stm32_muxbus_sdio_lock(dev, lock); return OK; } diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c index 870317c3177..49104f0c3cb 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c @@ -147,9 +147,8 @@ int stm32_bringup(void) #endif #ifdef HAVE_SDIO - ret = stm32_sdio_initialize(); - - if (ret < 0) + ret = stm32_sdio_initialize(); + if (ret < 0) { syslog(LOG_ERR, "ERROR: stm32_n25qxxx_setup failed: %d\n", ret); } diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c index 74e4c3b910f..4ef392c3a98 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c @@ -47,7 +47,6 @@ #include #include - #include "stm32_gpio.h" #include "stm32_sdmmc.h" #include "stm32f746g-disco.h" diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h index 6c476c118c5..f5c0d492d28 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h @@ -84,9 +84,9 @@ * Note that the EXTI interrupt is configured. */ -#define MIN_IRQBUTTON BUTTON_USER -#define MAX_IRQBUTTON BUTTON_USER -#define NUM_IRQBUTTONS 1 +#define MIN_IRQBUTTON BUTTON_USER +#define MAX_IRQBUTTON BUTTON_USER +#define NUM_IRQBUTTONS 1 #define GPIO_BTN_USER (GPIO_INPUT | GPIO_FLOAT | GPIO_EXTI | GPIO_PORTI | GPIO_PIN11) @@ -107,15 +107,15 @@ #define GPIO_SCHED_RUNNING (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_50MHz | GPIO_OUTPUT_CLEAR | \ GPIO_PORTG | GPIO_PIN7) -#define GPIO_LCD_DISP (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ - GPIO_OUTPUT_SET|GPIO_PORTI|GPIO_PIN12) +#define GPIO_LCD_DISP (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ + GPIO_OUTPUT_SET|GPIO_PORTI|GPIO_PIN12) -#define GPIO_LCD_BL (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ - GPIO_OUTPUT_SET|GPIO_PORTK|GPIO_PIN3) +#define GPIO_LCD_BL (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ + GPIO_OUTPUT_SET|GPIO_PORTK|GPIO_PIN3) /* SD/TF Card'detected pin */ -#define GPIO_SDIO_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTC|GPIO_PIN13) +#define GPIO_SDIO_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTC|GPIO_PIN13) #define SDIO_SLOTNO 0 #define SDIO_MINOR 0