Removal of sdi->index, step 4: fix trivial sr_dev_inst_new() calls

[libsigrok.git] / src / hardware / openbench-logic-sniffer / api.c

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index 25f296ebb6db4532c1ede91ccf9d97d719473005..8ed13d0013f056caed9a8df674444bd7fe15f52d 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -135,7 +135,7 @@ static GSList *scan(GSList *options)
         * have a match.
         */
        sr_info("Probing %s.", conn);
-       if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+       if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
        ret = SR_OK;
@@ -173,12 +173,11 @@ static GSList *scan(GSList *options)
        if (g_poll(&probefd, 1, 10) > 0) {
                /* Got metadata. */
                sdi = get_metadata(serial);
-               sdi->index = 0;
                devc = sdi->priv;
        } else {
                /* Not an OLS -- some other board that uses the sump protocol. */
                sr_info("Device does not support metadata.");
-               sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
+               sdi = sr_dev_inst_new(SR_ST_INACTIVE,
                                "Sump", "Logic Analyzer", "v1.0");
                sdi->driver = di;
                for (i = 0; i < 32; i++) {