feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/usb-host-device-close-err-give-semaphore_v5.1' into 'release/v5.1'

Browse Source 
fix(usb_host): Give semaphore on attempted close of non-opened device (backport v5.1)

See merge request espressif/esp-idf!38209
This commit is contained in:
morris
2025-04-05 22:33:18 +08:00
parent 3d5cf55f64 8f0af2dac5
commit 653eec6f30
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/usb/include/usb/usb_host.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */

3
components/usb/usb_host.c
View File

@@ -884,10 +884,9 @@ esp_err_t usb_host_device_close(usb_host_client_handle_t client_hdl, usb_device_
HOST_ENTER_CRITICAL(); HOST_ENTER_CRITICAL();
uint8_t dev_addr; uint8_t dev_addr;
ESP_ERROR_CHECK(usbh_dev_get_addr(dev_hdl, &dev_addr)); ESP_ERROR_CHECK(usbh_dev_get_addr(dev_hdl, &dev_addr));
HOST_CHECK_FROM_CRIT(_check_client_opened_device(client_obj, dev_addr), ESP_ERR_NOT_FOUND);
if (!_check_client_opened_device(client_obj, dev_addr)) { if (!_check_client_opened_device(client_obj, dev_addr)) {
// Client never opened this device // Client never opened this device
ret = ESP_ERR_INVALID_STATE; ret = ESP_ERR_NOT_FOUND;
HOST_EXIT_CRITICAL(); HOST_EXIT_CRITICAL();
goto exit; goto exit;
} }