X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=ea2afef621867ed774703497f7588e961ee6b48e;hb=a299a95413594201b4bb58d7d345e1933ebca5ae;hp=44841e852c18d5d705a60d020637b09ce89bdda5;hpb=3782e57129fa661a773be337c9f548708f593eb0;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 44841e85..ea2afef6 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -246,8 +246,6 @@ static int config_set(uint32_t key, GVariant *data,
 	state = devc->model_state;
 	update_sample_rate = FALSE;
 
-	ret = SR_ERR_NA;
-
 	switch (key) {
 	case SR_CONF_LIMIT_FRAMES:
 		devc->frame_limit = g_variant_get_uint64(data);
@@ -380,6 +378,8 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_COUPLING:
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
+		if (!model)
+			return SR_ERR_ARG;
 		*data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
@@ -400,6 +400,8 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_VDIV:
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
+		if (!model)
+			return SR_ERR_ARG;
 		*data = std_gvar_tuple_array(*model->vdivs, model->num_vdivs);
 		break;
 	default:
@@ -552,6 +554,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 			setup_changed = TRUE;
 			break;
 		default:
+			g_free(pod_enabled);
 			return SR_ERR;
 		}
 	}