Add the RB64 macro.

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index db86c61bc0d3b8cc86cdfc49904c539c5dfa9242..0eb86f4dee75ad66b05f31ba78b32ffcc39d1cba 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -261,6 +261,9 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
        }
        g_slist_free(sdi->channel_groups);
 
+       if (sdi->session)
+               sr_session_dev_remove(sdi->session, sdi);
+
        g_free(sdi->vendor);
        g_free(sdi->model);
        g_free(sdi->version);
@@ -541,11 +544,10 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
 {
 #ifdef HAVE_LIBUSB_1_0
        struct drv_context *drvc;
-       int r, cnt, i, a, b;
+       int cnt, i, a, b;
        char connection_id[64];
        struct sr_usb_dev_inst *usb;
        struct libusb_device **devlist;
-       struct libusb_device_descriptor des;
 #endif
 
        if (!sdi)
@@ -576,12 +578,6 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
                }
 
                for (i = 0; i < cnt; i++) {
-                       if ((r = libusb_get_device_descriptor(devlist[i], &des)) < 0) {
-                               sr_err("Failed to get device descriptor: %s.",
-                                      libusb_error_name(r));
-                               continue;
-                       }
-
                        /* Find the USB device by the logical address we know. */
                        b = libusb_get_bus_number(devlist[i]);
                        a = libusb_get_device_address(devlist[i]);