rigol-ds1xx2: newer Linux kernels have USBTMC in /sys/class/usbmisc

[libsigrok.git] / hardware / rigol-ds1xx2 / api.c

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 04d3f0aecd4c5845741eb9057f99e3e6235aeeeb..000de312999d5d17d42c072932e7e05e64d4a4f4 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -152,7 +152,7 @@ static void clear_helper(void *priv)
        g_free(devc->trigger_slope);
 }
 
-static int clear_instances(void)
+static int dev_clear(void)
 {
        return std_dev_clear(di, clear_helper);
 }
@@ -307,8 +307,9 @@ static GSList *scan(GSList *options)
                if (probe_port(port, &devices) == SR_ERR_MALLOC)
                        return NULL;
        } else {
-               if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL)))
-                       return NULL;
+               if (!(dir = g_dir_open("/sys/class/usbmisc/", 0, NULL)))
+                       if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL)))
+                               return NULL;
                while ((dev_name = g_dir_read_name(dir))) {
                        if (strncmp(dev_name, "usbtmc", 6))
                                continue;
@@ -364,7 +365,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       return clear_instances();
+       return dev_clear();
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
@@ -646,7 +647,7 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = clear_instances,
+       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,