From 383244dbc235ab442732a67041776edcdf65d9f4 Mon Sep 17 00:00:00 2001 From: Zhang Jun Hao Date: Thu, 5 Jul 2018 11:27:40 +0800 Subject: [PATCH] fix(spi_flash): Fix no exit critical after enter critical --- components/spi_flash/src/spi_flash.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/spi_flash/src/spi_flash.c b/components/spi_flash/src/spi_flash.c index 668afe9c..469ad965 100644 --- a/components/spi_flash/src/spi_flash.c +++ b/components/spi_flash/src/spi_flash.c @@ -287,10 +287,14 @@ static esp_err_t IRAM_ATTR spi_flash_write_status(uint32_t status_value) Cache_Read_Disable_2(); Wait_SPI_Idle(&flashchip); - if(ESP_OK != SPI_write_enable(&flashchip)) + if(ESP_OK != SPI_write_enable(&flashchip)){ + FLASH_INTR_UNLOCK(c_tmp); return ESP_ERR_FLASH_OP_FAIL; - if(ESP_OK != SPI_write_status(&flashchip,status_value)) + } + if(ESP_OK != SPI_write_status(&flashchip,status_value)){ + FLASH_INTR_UNLOCK(c_tmp); return ESP_ERR_FLASH_OP_FAIL; + } Wait_SPI_Idle(&flashchip); Cache_Read_Enable_2();