From: Matthias Heidbrink <redacted>
Date: Thu, 17 Oct 2013 08:57:16 +0000 (+0200)
Subject: std.c: Changed return value of std_dev_acquisition_stop_serial() for non-active devic... 
X-Git-Tag: libsigrok-0.2.2~26
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=1477a9a6dc4f470cb91c64c71c139825e8329adb;ds=sidebyside

std.c: Changed return value of std_dev_acquisition_stop_serial() for non-active device to SR_ERR_DEV_CLOSED for consistency with other functions.
---

diff --git a/std.c b/std.c
index 46ab5ad9..22123fc5 100644
--- a/std.c
+++ b/std.c
@@ -117,8 +117,10 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
  * @param prefix A driver-specific prefix string used for log messages.
  *               Must not be NULL. An empty string is allowed.
  *
- * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
- *         SR_ERR upon other errors.
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid arguments.
+ * @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,
 			void *cb_data, dev_close_t dev_close_fn,
@@ -134,7 +136,7 @@ SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
 
 	if (sdi->status != SR_ST_ACTIVE) {
 		sr_err("%sDevice inactive, can't stop acquisition.", prefix);
-		return SR_ERR;
+		return SR_ERR_DEV_CLOSED;
 	}
 
 	sr_dbg("%sStopping acquisition.", prefix);