X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-xstream%2Fapi.c;h=e00154b9bef88bc87d1d9066a4a5b31fa6daf65b;hb=8bf18daabbf3cb0fec6c178b4bc7f6283a314e45;hp=50094a406294355d8071f28c547862728b755ac3;hpb=7e463623382e1f574fde150b3fc88a65eaebb578;p=libsigrok.git

diff --git a/src/hardware/lecroy-xstream/api.c b/src/hardware/lecroy-xstream/api.c
index 50094a40..e00154b9 100644
--- a/src/hardware/lecroy-xstream/api.c
+++ b/src/hardware/lecroy-xstream/api.c
@@ -124,13 +124,11 @@ static void clear_helper(void *priv)
 	lecroy_xstream_state_free(devc->model_state);
 
 	g_free(devc->analog_groups);
-
-	g_free(devc);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-	return std_dev_clear(di, clear_helper);
+	return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -146,11 +144,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-	sr_scpi_close(sdi->conn);
-
-	sdi->status = SR_ST_INACTIVE;
-
-	return SR_OK;
+	return sr_scpi_close(sdi->conn);
 }
 
 static int config_get(uint32_t key, GVariant **data,