blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-13 02:59:13 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/add_return_in_uart_wait_tx_done_bp4.1' into 'release/v4.1'

Browse Source 
bugfix(UART): Add return in uart_wait_tx_done(backport v4.1)

See merge request espressif/esp-idf!10336
This commit is contained in:
Michael (XIAO Xufeng) 2020-09-14 14:25:05 +08:00
commit 1ced3f9750
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/driver/uart.c
View File

@ -1016,6 +1016,7 @@ esp_err_t uart_wait_tx_done(uart_port_t uart_num, TickType_t ticks_to_wait)
uart_hal_disable_intr_mask(&(uart_context[uart_num].hal), UART_INTR_TX_DONE); uart_hal_disable_intr_mask(&(uart_context[uart_num].hal), UART_INTR_TX_DONE);
UART_EXIT_CRITICAL(&(uart_context[uart_num].spinlock)); UART_EXIT_CRITICAL(&(uart_context[uart_num].spinlock));
xSemaphoreGive(p_uart_obj[uart_num]->tx_mux); xSemaphoreGive(p_uart_obj[uart_num]->tx_mux);
return ESP_ERR_TIMEOUT;
} }
xSemaphoreGive(p_uart_obj[uart_num]->tx_mux); xSemaphoreGive(p_uart_obj[uart_num]->tx_mux);
return ESP_OK; return ESP_OK;