X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=c58906f85d352bc59014ca6171a74adc622f895b;hb=ad466f86cc0497f6a5ba0e2540e399c32c0b96ba;hp=f84482358979ccb3dbf8b5ff92c22fcd780440c7;hpb=8662130615d7a59883c303914f94377032101cb9;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index f8448235..c58906f8 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -109,10 +109,8 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
 	return sdi;
 
 fail:
-	if (hw_info)
-		sr_scpi_hw_info_free(hw_info);
-	if (sdi)
-		sr_dev_inst_free(sdi);
+	sr_scpi_hw_info_free(hw_info);
+	sr_dev_inst_free(sdi);
 	g_free(devc);
 
 	return NULL;
@@ -490,7 +488,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	struct dev_context *devc = NULL;
 	const struct scope_config *model = NULL;
 
-	/* SR_CONF_SCAN_OPTIONS is always valid, regardless of sdi or probe group. */
+	/* SR_CONF_SCAN_OPTIONS is always valid, regardless of sdi or channel group. */
 	if (key == SR_CONF_SCAN_OPTIONS) {
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 				dlm_scanopts, ARRAY_SIZE(dlm_scanopts), sizeof(uint32_t));
@@ -512,7 +510,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 
 	/*
 	 * If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
-	 * specific to a probe group must be returned.
+	 * specific to a channel group must be returned.
 	 */
 	if (!cg) {
 		switch (key) {