scan(): Consistently start out with SR_ST_INACTIVE.

[libsigrok.git] / src / hardware / saleae-logic16 / protocol.c

diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c
index d75be36dda6c2d00d4398f4dc3cb23a7755cdc37..4cdc28f3f652fbe1e88086bb0f2f4638bd2db25d 100644 (file)
--- a/src/hardware/saleae-logic16/protocol.c
+++ b/src/hardware/saleae-logic16/protocol.c
@@ -763,7 +763,6 @@ static void finish_acquisition(struct sr_dev_inst *sdi)
 
        std_session_send_df_end(sdi, LOG_PREFIX);
 
-       /* Remove fds from polling. */
        usb_source_remove(sdi->session, devc->ctx);
 
        devc->num_transfers = 0;
@@ -933,7 +932,7 @@ SR_PRIV void LIBUSB_CALL logic16_receive_transfer(struct libusb_transfer *transf
                        logic.length = new_samples * 2;
                        logic.unitsize = 2;
                        logic.data = devc->convbuffer;
-                       sr_session_send(devc->cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                        devc->sent_samples += new_samples;
                } else {
                        trigger_offset = soft_trigger_logic_check(devc->stl,
@@ -949,7 +948,7 @@ SR_PRIV void LIBUSB_CALL logic16_receive_transfer(struct libusb_transfer *transf
                                logic.length = num_samples * 2;
                                logic.unitsize = 2;
                                logic.data = devc->convbuffer + trigger_offset * 2;
-                               sr_session_send(devc->cb_data, &packet);
+                               sr_session_send(sdi, &packet);
                                devc->sent_samples += num_samples;
 
                                devc->trigger_fired = TRUE;