X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=bd4c71181264907c8df6f8c09220b6d02ccb4f68;hp=1e35a5419798363b9c54e2eefaa4f8888990cc3c;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hpb=7e463623382e1f574fde150b3fc88a65eaebb578

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 1e35a541..bd4c7118 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -456,16 +456,13 @@ static int dev_close(struct sr_dev_inst *sdi)
 	scpi = sdi->conn;
 	devc = sdi->priv;
 
+	if (!scpi)
+		return SR_ERR_BUG;
+
 	if (devc->model->series->protocol == PROTOCOL_V2)
 		rigol_ds_config_set(sdi, ":KEY:LOCK DISABLE");
 
-	if (scpi) {
-		if (sr_scpi_close(scpi) < 0)
-			return SR_ERR;
-		sdi->status = SR_ST_INACTIVE;
-	}
-
-	return SR_OK;
+	return sr_scpi_close(scpi);
 }
 
 static int analog_frame_size(const struct sr_dev_inst *sdi)