X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdreamsourcelab-dslogic%2Fapi.c;h=66c4dc73e0b98c51a4952ee1f9914c14e9edbf3c;hb=090f1e1e5478ea15baa3731fefbd4aff9be78c77;hp=0838d672e2bd23dd03780dcfbdba60953a72e1d7;hpb=bc98407b8f6bb1b083b83a2d895b86aeec771132;p=libsigrok.git

diff --git a/src/hardware/dreamsourcelab-dslogic/api.c b/src/hardware/dreamsourcelab-dslogic/api.c
index 0838d672..66c4dc73 100644
--- a/src/hardware/dreamsourcelab-dslogic/api.c
+++ b/src/hardware/dreamsourcelab-dslogic/api.c
@@ -214,10 +214,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			continue;
 		}
 
-		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
-
 		libusb_close(hdl);
 
+		if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+			continue;
+
 		prof = NULL;
 		for (j = 0; supported_device[j].vid; j++) {
 			if (des.idVendor == supported_device[j].vid &&
@@ -359,8 +360,10 @@ static int dev_open(struct sr_dev_inst *sdi)
 		devc->cur_samplerate = devc->samplerates[0];
 	}
 
-	if (devc->cur_threshold == 0.0)
-		devc->cur_threshold = 1.5;
+	if (devc->cur_threshold == 0.0) {
+		devc->cur_threshold = thresholds[1][0];
+		return dslogic_set_voltage_threshold(sdi, devc->cur_threshold);
+	}
 
 	return SR_OK;
 }
@@ -514,12 +517,16 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_DEVICE_OPTIONS:
 		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	case SR_CONF_VOLTAGE_THRESHOLD:
+		if (!devc || !devc->profile)
+			return SR_ERR_ARG;
 		if (!strcmp(devc->profile->model, "DSLogic"))
 			*data = std_gvar_thresholds(ARRAY_AND_SIZE(thresholds));
 		else
 			*data = std_gvar_min_max_step_thresholds(0.0, 5.0, 0.1);
 		break;
 	case SR_CONF_SAMPLERATE:
+		if (!devc)
+			return SR_ERR_ARG;
 		*data = std_gvar_samplerates(devc->samplerates, devc->num_samplerates);
 		break;
 	case SR_CONF_TRIGGER_MATCH: