Merge branch 'contrib/github_pr_14859_v5.4' into 'release/v5.4'

suda-morris · suda-morris · commit 779106e49c15 · 2024-11-15T10:56:46.000+08:00
fix(usb_host): return ESP_ERR_NO_MEM on failed alloc in client register (GitHub PR) (v5.4)

See merge request espressif/esp-idf!34875
diff --git a/components/usb/usb_host.c b/components/usb/usb_host.c
@@ -818,7 +818,7 @@ esp_err_t usb_host_client_register(const usb_host_client_config_t *client_config
         vSemaphoreDelete(event_sem);
     }
     heap_caps_free(client_obj);
-    return ESP_OK;
+    return ret;
 }
 
 esp_err_t usb_host_client_deregister(usb_host_client_handle_t client_hdl)

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,7 @@ esp_err_t usb_host_client_register(const usb_host_client_config_t *client_config`
`818`	`818`	`vSemaphoreDelete(event_sem);`
`819`	`819`	`}`
`820`	`820`	`heap_caps_free(client_obj);`
`821`		`- return ESP_OK;`
	`821`	`+ return ret;`
`822`	`822`	`}`
`823`	`823`
`824`	`824`	`esp_err_t usb_host_client_deregister(usb_host_client_handle_t client_hdl)`