X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=f80e83dceb7e91537252d05b37a516e12e225ac3;hb=fe953391bd7782813256c02350afa1996c773659;hp=9d5660761b0549ff0e19c5a440fe054a8126be79;hpb=3782e57129fa661a773be337c9f548708f593eb0;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 9d566076..f80e83dc 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -164,6 +164,8 @@ static int check_channel_group(struct dev_context *devc,
 {
 	const struct scope_config *model;
 
+	if (!devc)
+		return CG_INVALID;
 	model = devc->model_config;
 
 	if (!cg)
@@ -284,8 +286,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);
@@ -409,6 +409,8 @@ static int config_list(uint32_t key, GVariant **data,
 			*data = g_variant_new_strv(ARRAY_AND_SIZE(dlm_trigger_slopes));
 			return SR_OK;
 		case SR_CONF_NUM_HDIV:
+			if (!model)
+				return SR_ERR_ARG;
 			*data = g_variant_new_uint32(model->num_xdivs);
 			return SR_OK;
 		default: