X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=ccb73718c9b26b0fdf129b43439f437c5405e414;hb=093e1cba6b7bf14cfb77fa36f59b0c16e6fca7cc;hp=87b3f1f137d5950116aeaf1b8b91cd0127715567;hpb=2ea1fdf12113311cbe1a4316e9e2efe4d8ac40f0;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index 87b3f1f1..ccb73718 100644
--- a/src/std.c
+++ b/src/std.c
@@ -98,8 +98,6 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
 
-	sr_dbg("%s: Starting acquisition.", prefix);
-
 	/* Send header packet to the session bus. */
 	sr_dbg("%s: Sending SR_DF_HEADER packet.", prefix);
 	packet.type = SR_DF_HEADER;
@@ -183,17 +181,22 @@ SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi)
  * to SR_ST_INACTIVE.
  *
  * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid arguments.
  */
 SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
 {
 	struct sr_serial_dev_inst *serial;
 
+	sdi->status = SR_ST_INACTIVE;
+
 	serial = sdi->conn;
-	if (serial && sdi->status == SR_ST_ACTIVE) {
-		serial_close(serial);
-		sdi->status = SR_ST_INACTIVE;
+	if (!serial) {
+		sr_err("%s: Can't close invalid serial port.", sdi->driver->name);
+		return SR_ERR_ARG;
 	}
 
+	serial_close(serial);
+
 	return SR_OK;
 }
 
@@ -217,19 +220,12 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi)
 	const char *prefix = sdi->driver->name;
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE) {
-		sr_err("%s: Device inactive, can't stop acquisition.", prefix);
-		return SR_ERR_DEV_CLOSED;
-	}
-
-	sr_dbg("%s: Stopping acquisition.", prefix);
-
 	if ((ret = serial_source_remove(sdi->session, serial)) < 0) {
 		sr_err("%s: Failed to remove source: %d.", prefix, ret);
 		return ret;
 	}
 
-	if ((ret = sdi->driver->dev_close(sdi)) < 0) {
+	if ((ret = sr_dev_close(sdi)) < 0) {
 		sr_err("%s: Failed to close device: %d.", prefix, ret);
 		return ret;
 	}