Backport recent changes from mainline.

[libsigrok.git] / src / hardware / ikalogic-scanaplus / protocol.c

diff --git a/src/hardware/ikalogic-scanaplus/protocol.c b/src/hardware/ikalogic-scanaplus/protocol.c
index 39dcfa2cd46ec7f16c37f908d25942dbfb4d23e1..c0e253626a67370b72afa060b6aa025946911bdb 100644 (file)
--- a/src/hardware/ikalogic-scanaplus/protocol.c
+++ b/src/hardware/ikalogic-scanaplus/protocol.c
@@ -319,7 +319,7 @@ SR_PRIV int scanaplus_receive_data(int fd, int revents, void *cb_data)
        if (bytes_read < 0) {
                sr_err("Failed to read FTDI data (%d): %s.",
                       bytes_read, ftdi_get_error_string(devc->ftdic));
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
                return FALSE;
        }
        if (bytes_read == 0) {
@@ -358,12 +358,12 @@ SR_PRIV int scanaplus_receive_data(int fd, int revents, void *cb_data)
        if (devc->limit_samples && (n >= devc->limit_samples)) {
                send_samples(sdi, devc->limit_samples - devc->samples_sent);
                sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
                return TRUE;
        } else if (devc->limit_msec && (n >= max)) {
                send_samples(sdi, max - devc->samples_sent);
                sr_info("Requested time limit reached.");
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
                return TRUE;
        } else {
                send_samples(sdi, devc->bytes_received / 2);