X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=174425b709e4087d9e2aaf9352d21c69f2cd1144;hb=98bfc4741f76b07e7db4c9628a6924004fc4fff4;hp=34d7de145e58af9a7804c993b819fb8b3f13e583;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index 34d7de14..174425b7 100644
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -82,7 +82,6 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
-	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GSList *l, *devices;
 	int len, cnt;
@@ -112,8 +111,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
 	if (!serialcomm)
 		serialcomm = SERIALCOMM;
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
 
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
@@ -156,8 +154,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
 			sdi->conn = serial;
 			sdi->priv = devc;
 			sdi->driver = drv;
-			ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
-			sdi->channels = g_slist_append(sdi->channels, ch);
+			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 			drvc->instances = g_slist_append(drvc->instances, sdi);
 			devices = g_slist_append(devices, sdi);
 			break;