From 581f09e1c80a30b81031d1ef245416ca6b84927b Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Thu, 6 Apr 2023 14:37:50 +0800 Subject: [PATCH] The libusb_free_device_list do not release the device handel --- libsigrok4DSL/hardware/DSL/dscope.c | 2 +- libsigrok4DSL/hardware/DSL/dslogic.c | 2 +- libsigrok4DSL/hardware/common/usb.c | 4 ++-- libsigrok4DSL/hwdriver.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libsigrok4DSL/hardware/DSL/dscope.c b/libsigrok4DSL/hardware/DSL/dscope.c index dcc8e47b..5d37f131 100644 --- a/libsigrok4DSL/hardware/DSL/dscope.c +++ b/libsigrok4DSL/hardware/DSL/dscope.c @@ -371,7 +371,7 @@ static GSList *scan(GSList *options) } } - libusb_free_device_list(devlist, 1); + libusb_free_device_list(devlist, 0); if (conn_devices){ g_slist_free_full(conn_devices, (GDestroyNotify)sr_usb_dev_inst_free); diff --git a/libsigrok4DSL/hardware/DSL/dslogic.c b/libsigrok4DSL/hardware/DSL/dslogic.c index ed0cc945..0138a52f 100644 --- a/libsigrok4DSL/hardware/DSL/dslogic.c +++ b/libsigrok4DSL/hardware/DSL/dslogic.c @@ -457,7 +457,7 @@ static GSList *scan(GSList *options) } } - libusb_free_device_list(devlist, 1); + libusb_free_device_list(devlist, 0); if (conn_devices){ g_slist_free_full(conn_devices, (GDestroyNotify)sr_usb_dev_inst_free); diff --git a/libsigrok4DSL/hardware/common/usb.c b/libsigrok4DSL/hardware/common/usb.c index 8090135b..7c511682 100644 --- a/libsigrok4DSL/hardware/common/usb.c +++ b/libsigrok4DSL/hardware/common/usb.c @@ -138,7 +138,7 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn) devices = g_slist_append(devices, usb); } - libusb_free_device_list(devlist, 1); + libusb_free_device_list(devlist, 0); sr_dbg("Found %d device(s).", g_slist_length(devices)); @@ -205,7 +205,7 @@ SR_PRIV GSList *sr_usb_find_usbtmc(libusb_context *usb_ctx) libusb_free_config_descriptor(confdes); } } - libusb_free_device_list(devlist, 1); + libusb_free_device_list(devlist, 0); sr_dbg("Found %d device(s).", g_slist_length(devices)); diff --git a/libsigrok4DSL/hwdriver.c b/libsigrok4DSL/hwdriver.c index 65112156..ed22137d 100644 --- a/libsigrok4DSL/hwdriver.c +++ b/libsigrok4DSL/hwdriver.c @@ -414,7 +414,7 @@ SR_PRIV int ds_scan_all_device_list(libusb_context *usb_ctx,struct libusb_device *count = wr; - libusb_free_device_list(devlist, 1); + libusb_free_device_list(devlist, 0); return SR_OK; }