X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fapi.c;h=64753d780dd2162648fde1982146d07d663d97e4;hb=d999f2b61e96882aed01fd58cbf45e773b855009;hp=b5d73b2382472e5e7896f61a541ff470c3398184;hpb=95c1fe62f77d347bf173b1236c38a9043efabd2b;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index b5d73b23..64753d78 100644
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -158,27 +158,26 @@ static int config_set(uint32_t key, GVariant *data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	int ret;
 
 	(void)cg;
 
 	devc = sdi->priv;
-	ret = SR_OK;
+
 	switch (key) {
 	case SR_CONF_DATALOG:
 		if (g_variant_get_boolean(data))
-			ret = lascar_start_logging(sdi);
+			return lascar_start_logging(sdi);
 		else
-			ret = lascar_stop_logging(sdi);
+			return lascar_stop_logging(sdi);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		devc->limit_samples = g_variant_get_uint64(data);
 		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data,
@@ -289,7 +288,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, g_variant_new_uint64(interval));
 	meta.config = g_slist_append(NULL, src);
 	sr_session_send(sdi, &packet);
-	g_free(src);
+	g_slist_free(meta.config);
+	sr_config_free(src);
 
 	if (devc->logged_samples == 0) {
 		/* This ensures the frontend knows the session is done. */