sr_dev_close(): Factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / std.c

diff --git a/src/std.c b/src/std.c
index df7a17495ed8dda02952f6943197257842a6d66d..ccb73718c9b26b0fdf129b43439f437c5405e414 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -181,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;
 }
 
@@ -220,7 +225,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi)
                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;
        }