X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fapi.c;h=20a922fa215177a139587c94121693ec6bac45a0;hb=821266e8ed4116e08f2a64561cc570c47b5a4b40;hp=ebc0ddab85a96bd81ce7f1e416215ead5dd878da;hpb=758906aa711c2936e7e9adcb449f70905087a5d9;p=libsigrok.git

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index ebc0ddab..20a922fa 100644
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -140,14 +140,12 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
 	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("Maynuo");
 	sdi->model = g_strdup(model->name);
-	sdi->version = g_strdup_printf("v%d.%d", version/10, version%10);
+	sdi->version = g_strdup_printf("v%d.%d", version / 10, version % 10);
 	sdi->conn = modbus;
 	sdi->driver = &maynuo_m97_driver_info;
 	sdi->inst_type = SR_INST_MODBUS;
 
-	cg = g_malloc0(sizeof(struct sr_channel_group));
-	cg->name = g_strdup("1");
-	sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
+	cg = sr_channel_group_new(sdi, "1", NULL);
 
 	ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V1");
 	cg->channels = g_slist_append(cg->channels, ch);
@@ -363,9 +361,13 @@ static int config_list(uint32_t key, GVariant **data,
 			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
 			break;
 		case SR_CONF_VOLTAGE_TARGET:
+			if (!devc || !devc->model)
+				return SR_ERR_ARG;
 			*data = std_gvar_min_max_step(0.0, devc->model->max_voltage, 0.001);
 			break;
 		case SR_CONF_CURRENT_LIMIT:
+			if (!devc || !devc->model)
+				return SR_ERR_ARG;
 			*data = std_gvar_min_max_step(0.0, devc->model->max_current, 0.0001);
 			break;
 		default: