std: Standardize function name.

[libsigrok.git] / std.c

diff --git a/std.c b/std.c
index 1067c271542c2ff41ce03fdc7fe528a1b63ddbd0..2b4dec3fc7903f5e474092e985c42acdfe3295cb 100644 (file)
--- a/std.c
+++ b/std.c
@@ -124,7 +124,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
  * @retval SR_ERR_DEV_CLOSED Device is closed.
  * @retval SR_ERR Other errors.
  */
-SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
+SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
                        void *cb_data, dev_close_t dev_close_fn,
                        struct sr_serial_dev_inst *serial, const char *prefix)
 {
@@ -231,12 +231,12 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
        return ret;
 }
 
-SR_PRIV int std_serial_close(struct sr_dev_inst *sdi)
+SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
 {
        struct sr_serial_dev_inst *serial;
 
        serial = sdi->conn;
-       if (serial && serial->fd != -1) {
+       if (serial && sdi->status == SR_ST_ACTIVE) {
                serial_close(serial);
                sdi->status = SR_ST_INACTIVE;
        }