X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fapi.c;h=0e593938eb4c15f74f3957a60f7a89912dffbbc3;hb=9bf093011ae7692c4808d52f540b4be23b89ffcf;hp=1ae2adeda381b7e66c9862968ed3719c49b4280c;hpb=dd7a72ea697a172032f5473b0ddff5e8d47222f4;p=libsigrok.git

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 1ae2aded..0e593938 100644
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -321,39 +321,31 @@ static int config_set(uint32_t key, GVariant *data,
 {
 	struct dev_context *devc;
 	struct sr_modbus_dev_inst *modbus;
-	int ret;
 
 	(void)cg;
 
 	modbus = sdi->conn;
 	devc = sdi->priv;
 
-	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
 	case SR_CONF_LIMIT_MSEC:
-		ret = sr_sw_limits_config_set(&devc->limits, key, data);
-		break;
+		return sr_sw_limits_config_set(&devc->limits, key, data);
 	case SR_CONF_ENABLED:
-		ret = maynuo_m97_set_input(modbus, g_variant_get_boolean(data));
-		break;
+		return maynuo_m97_set_input(modbus, g_variant_get_boolean(data));
 	case SR_CONF_VOLTAGE_TARGET:
-		ret = maynuo_m97_set_float(modbus, UFIX, g_variant_get_double(data));
-		break;
+		return maynuo_m97_set_float(modbus, UFIX, g_variant_get_double(data));
 	case SR_CONF_CURRENT_LIMIT:
-		ret = maynuo_m97_set_float(modbus, IFIX, g_variant_get_double(data));
-		break;
+		return maynuo_m97_set_float(modbus, IFIX, g_variant_get_double(data));
 	case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
-		ret = maynuo_m97_set_float(modbus, UMAX, g_variant_get_double(data));
-		break;
+		return maynuo_m97_set_float(modbus, UMAX, g_variant_get_double(data));
 	case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
-		ret = maynuo_m97_set_float(modbus, IMAX, g_variant_get_double(data));
-		break;
+		return maynuo_m97_set_float(modbus, IMAX, g_variant_get_double(data));
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data,
@@ -371,9 +363,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: