X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=std.c;h=2319dfef9273f47524fd61bcebb7535f8f21135b;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=1a65b039ab3b0abf9600cbb9dc7e59d6cdb9a8af;hpb=813aab691b255580d3247b9fec7ab3f7b4fc8a18;p=libsigrok.git

diff --git a/std.c b/std.c
index 1a65b039..2319dfef 100644
--- a/std.c
+++ b/std.c
@@ -182,7 +182,7 @@ SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
  * @retval SR_ERR Other errors.
  */
 SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
-			void *cb_data, dev_close_t dev_close_fn,
+			void *cb_data, dev_close_callback dev_close_fn,
 			struct sr_serial_dev_inst *serial, const char *prefix)
 {
 	int ret;
@@ -200,7 +200,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
 
 	sr_dbg("%s: Stopping acquisition.", prefix);
 
-	if ((ret = serial_source_remove(serial)) < 0) {
+	if ((ret = serial_source_remove(sdi->session, serial)) < 0) {
 		sr_err("%s: Failed to remove source: %d.", prefix, ret);
 		return ret;
 	}
@@ -245,7 +245,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
  * @return SR_OK on success.
  */
 SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
-		std_dev_clear_t clear_private)
+		std_dev_clear_callback clear_private)
 {
 	struct drv_context *drvc;
 	struct sr_dev_inst *sdi;