output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / fluke-45 / api.c

diff --git a/src/hardware/fluke-45/api.c b/src/hardware/fluke-45/api.c
index 16c7dc03da23b06437b5eb633040d391539a33c5..96c8a1b324081507b8a07d64d80fec4c3f358506 100644 (file)
--- a/src/hardware/fluke-45/api.c
+++ b/src/hardware/fluke-45/api.c
@@ -31,12 +31,6 @@
 #include "scpi.h"
 #include "protocol.h"
 
-/*
- * This test violates the SCPI protocol, and confuses other devices.
- * Disable it for now, until a better location was found.
- */
-#define ECHO_TEST 0
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
@@ -68,26 +62,15 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
        unsigned int i;
        const struct fluke_scpi_dmm_model *model = NULL;
        gchar *channel_name;
-#if ECHO_TEST
-       char *response;
-#endif
-
-#if ECHO_TEST
-       /* Test for serial port ECHO enabled. */
-       response = NULL;
-       sr_scpi_get_string(scpi, "ECHO-TEST", &response);
-       if (response && strcmp(response, "ECHO-TEST") == 0) {
-               sr_err("Serial port ECHO is ON. Please turn it OFF!");
-               return NULL;
-       }
-#endif
 
        /* Get device IDN. */
        if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+               sr_scpi_hw_info_free(hw_info);
                sr_info("Couldn't get IDN response, retrying.");
                sr_scpi_close(scpi);
                sr_scpi_open(scpi);
                if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+                       sr_scpi_hw_info_free(hw_info);
                        sr_info("Couldn't get IDN response.");
                        return NULL;
                }