X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=std.c;h=7837d35a3c32f95f0bcabbca69c1655d1b67f675;hb=7faa3e8821735e063e17fcad326c68aae14fe907;hp=44435be22520745d460dc66ffe4d64a80449568c;hpb=c4f2dfd0f0df07e6e2b10e33c46c9c457c9c5016;p=libsigrok.git

diff --git a/std.c b/std.c
index 44435be2..7837d35a 100644
--- a/std.c
+++ b/std.c
@@ -143,7 +143,7 @@ SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
 
 	sr_dbg("%sStopping acquisition.", prefix);
 
-	if ((ret = sr_source_remove(serial->fd)) < 0) {
+	if ((ret = serial_source_remove(serial)) < 0) {
 		sr_err("%sFailed to remove source: %d.", prefix, ret);
 		return ret;
 	}
@@ -215,6 +215,8 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
 			if (sdi->inst_type == SR_INST_USB)
 				sr_usb_dev_inst_free(sdi->conn);
 #endif
+			if (sdi->inst_type == SR_INST_SCPI)
+				sr_scpi_free(sdi->conn);
 		}
 		if (clear_private)
 			clear_private(sdi->priv);