X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=1274b919bf61dd20d8f837e4c47da0aad21e9c3b;hb=653d087e15293c562409ef29ae231f8b16de39ea;hp=e4c53887e4ececca857129c47ff09bf2298d87a2;hpb=addbb09bf81444030dcd17094e8892a91875b157;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index e4c53887..1274b919 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -366,11 +366,11 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_DEVICE_OPTIONS:
 		if (!cg) {
 			if (model)
-				*data = std_gvar_array_u32((const uint32_t *)model->devopts, model->num_devopts);
+				*data = std_gvar_array_u32(*model->devopts, model->num_devopts);
 			else
 				*data = std_gvar_array_u32(ARRAY_AND_SIZE(drvopts));
 		} else if (cg_type == CG_ANALOG) {
-			*data = std_gvar_array_u32((const uint32_t *)model->devopts_cg_analog, model->num_devopts_cg_analog);
+			*data = std_gvar_array_u32(*model->devopts_cg_analog, model->num_devopts_cg_analog);
 		} else {
 			*data = std_gvar_array_u32(NULL, 0);
 		}
@@ -529,8 +529,10 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 				   (*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE],
 				   ch->index + 1, ch->enabled);
 
-			if (sr_scpi_send(scpi, command) != SR_OK)
+			if (sr_scpi_send(scpi, command) != SR_OK) {
+				g_free(pod_enabled);
 				return SR_ERR;
+			}
 			state->analog_channels[ch->index].state = ch->enabled;
 			setup_changed = TRUE;
 			break;
@@ -548,8 +550,10 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 				   (*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE],
 				   ch->index, ch->enabled);
 
-			if (sr_scpi_send(scpi, command) != SR_OK)
+			if (sr_scpi_send(scpi, command) != SR_OK) {
+				g_free(pod_enabled);
 				return SR_ERR;
+			}
 
 			state->digital_channels[ch->index] = ch->enabled;
 			setup_changed = TRUE;