X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fstd.c;h=13f9b03195f549eafa40e02072605242dc6f7294;hp=35da70884a700a8256f461480c4a6223d1c9c7ce;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hpb=7e463623382e1f574fde150b3fc88a65eaebb578

diff --git a/src/std.c b/src/std.c
index 35da7088..13f9b031 100644
--- a/src/std.c
+++ b/src/std.c
@@ -174,27 +174,20 @@ SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi)
  * This function can be used to implement the dev_close() driver API
  * callback in drivers that use a serial port.
  *
- * After closing the port, the status field of the given sdi is set
- * to SR_ST_INACTIVE.
- *
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid arguments.
+ * @retval SR_ERR Serial port close failed.
  */
 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) {
-		sr_err("%s: Can't close invalid serial port.", sdi->driver->name);
+	if (!sdi || !sdi->conn)
 		return SR_ERR_ARG;
-	}
 
-	serial_close(serial);
+	serial = sdi->conn;
 
-	return SR_OK;
+	return serial_close(serial);
 }
 
 /**