Merge branch 'contrib/github_pr_12258_v5.1' into 'release/v5.1'

fix(vfs): Fix event_write may not exit critical section (GitHub PR) (v5.1)

See merge request espressif/esp-idf!26047
This commit is contained in:
Marius Vikhammer 2023-09-19 20:40:22 +08:00
commit b8d3ee9844

View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -267,14 +267,14 @@ static ssize_t event_write(int fd, const void *data, size_t size)
s_events[fd].value += *val;
ret = size;
trigger_select_for_event(&s_events[fd]);
if (s_events[fd].support_isr) {
portEXIT_CRITICAL(&s_events[fd].data_spin_lock);
}
} else {
errno = EBADF;
ret = -1;
}
if (s_events[fd].support_isr) {
portEXIT_CRITICAL(&s_events[fd].data_spin_lock);
}
_lock_release_recursive(&s_events[fd].lock);
}
return ret;