Add sr_dev_acquisition_start(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / lcr / es51919.c

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index 8d9d9d96476c8e22870baeb06eb4219936484f2b..fd26fd9e48df23a4f2de7c399cfc50b031aada10 100644 (file)
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -731,7 +731,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 
        if (dev_limit_counter_limit_reached(&devc->frame_count) ||
            dev_time_limit_reached(&devc->time_count))
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
 
        return TRUE;
 }
@@ -800,8 +800,7 @@ SR_PRIV struct sr_dev_inst *es51919_serial_scan(GSList *options,
 scan_cleanup:
        es51919_serial_clean(devc);
        sr_dev_inst_free(sdi);
-       if (serial)
-               sr_serial_dev_inst_free(serial);
+       sr_serial_dev_inst_free(serial);
 
        return NULL;
 }
@@ -910,9 +909,6 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        if (!(devc = sdi->priv))
                return SR_ERR_BUG;