From 95fe7929c084302f8e80aa9f3fff651c5996dd52 Mon Sep 17 00:00:00 2001 From: Henrik Maier Date: Tue, 30 May 2017 17:05:36 +1000 Subject: [PATCH] Fix spinlock bug for uart_set_rts and uart_set_dtr Merges https://github.com/espressif/esp-idf/pull/649 --- components/driver/uart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/driver/uart.c b/components/driver/uart.c index 976efda3d..3997db2b4 100644 --- a/components/driver/uart.c +++ b/components/driver/uart.c @@ -424,7 +424,7 @@ esp_err_t uart_set_rts(uart_port_t uart_num, int level) UART_CHECK((UART[uart_num]->conf1.rx_flow_en != 1), "disable hw flowctrl before using sw control", ESP_FAIL); UART_ENTER_CRITICAL(&uart_spinlock[uart_num]); UART[uart_num]->conf0.sw_rts = level & 0x1; - UART_ENTER_CRITICAL(&uart_spinlock[uart_num]); + UART_EXIT_CRITICAL(&uart_spinlock[uart_num]); return ESP_OK; } @@ -433,7 +433,7 @@ esp_err_t uart_set_dtr(uart_port_t uart_num, int level) UART_CHECK((uart_num < UART_NUM_MAX), "uart_num error", ESP_FAIL); UART_ENTER_CRITICAL(&uart_spinlock[uart_num]); UART[uart_num]->conf0.sw_dtr = level & 0x1; - UART_ENTER_CRITICAL(&uart_spinlock[uart_num]); + UART_EXIT_CRITICAL(&uart_spinlock[uart_num]); return ESP_OK; }