X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds%2Fapi.c;h=465001048ac5af4a93c87d6db478a35f86140467;hb=f2a189f0a7737d6abc1140b61a554c4a9f1efb70;hp=b8dbe89fdb28e8ff0f8729d2a0bdb64638723dcb;hpb=5d336f1130ddc2faaeabd7ed6ec602904054bfb8;p=libsigrok.git

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index b8dbe89f..46500104 100644
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -272,10 +272,13 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	gchar *channel_name, **version;
 
 	if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
-		sr_info("Couldn't get IDN response.");
+		sr_info("Couldn't get IDN response, retrying.");
 		sr_scpi_close(scpi);
-		sr_scpi_free(scpi);
-		return NULL;
+		sr_scpi_open(scpi);
+		if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+			sr_info("Couldn't get IDN response.");
+			return NULL;
+		}
 	}
 
 	for (i = 0; i < ARRAY_SIZE(supported_models); i++) {
@@ -292,13 +295,9 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 						  model->name,
 						  hw_info->firmware_version))) {
 		sr_scpi_hw_info_free(hw_info);
-		sr_scpi_close(scpi);
-		sr_scpi_free(scpi);
 		return NULL;
 	}
 
-	sr_scpi_close(scpi);
-
 	sdi->conn = scpi;
 
 	sdi->driver = di;
@@ -948,7 +947,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	switch (devc->model->series->protocol) {
 	case PROTOCOL_V2:
-		if (rigol_ds_config_set(sdi, ":ACQ:MDEP LONG") != SR_OK)
+		if (rigol_ds_config_set(sdi, ":ACQ:MEMD LONG") != SR_OK)
 			return SR_ERR;
 		break;
 	case PROTOCOL_V3: