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

[libsigrok.git] / src / hardware / norma-dmm / api.c

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index deefceaebac6f9623281733ad0d388314a1911a2..93c9a79d853bcf75ac16cab4bd9b75832529c20e 100644 (file)
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -115,7 +115,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
        if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
                return NULL;
 
-       if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+       if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
        serial_flush(serial);
@@ -144,7 +144,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
                        auxtype = xgittoint(buf[7]);
                        sr_spew("%s %s DMM %s detected!", get_brandstr(drv), get_typestr(auxtype, drv), buf + 9);
 
-                       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
+                       if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE,
                                                get_brandstr(drv), get_typestr(auxtype, drv), buf + 9)))
                                return NULL;
                        if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {