SCPI: Do not use RL1 lockout for Yokogawa devices

[libsigrok.git] / src / scpi / scpi.c

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index 0efde8bab7b9c11f8d2cec00ee48f1afd0ecac4f..fc7e9939c0e72ae5dfe173b25147ead17ffe5143 100644 (file)
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -110,12 +110,16 @@ static struct sr_dev_inst *sr_scpi_scan_resource(struct drv_context *drvc,
                return NULL;
        };
 
-       if ((sdi = probe_device(scpi)))
-               return sdi;
+       sdi = probe_device(scpi);
 
        sr_scpi_close(scpi);
-       sr_scpi_free(scpi);
-       return NULL;
+
+       if (sdi)
+               sdi->status = SR_ST_INACTIVE;
+       else
+               sr_scpi_free(scpi);
+
+       return sdi;
 }
 
 SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
@@ -575,7 +579,7 @@ SR_PRIV int sr_scpi_get_opc(struct sr_scpi_dev_inst *scpi)
        unsigned int i;
        gboolean opc;
 
-       for (i = 0; i < SCPI_READ_RETRIES; ++i) {
+       for (i = 0; i < SCPI_READ_RETRIES; i++) {
                sr_scpi_get_bool(scpi, SCPI_CMD_OPC, &opc);
                if (opc)
                        return SR_OK;