X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmicrochip-pickit2%2Fapi.c;h=79c79d3eae7286dfa78d39c5419190608b0fa10a;hb=c1f9428a6c95e639e3d613738b6a2b08c8496ee0;hp=d8a757283655496d10b9a2c2d26eed2c7c875694;hpb=d810901a45e01b8e79f6b269dbb931b538071953;p=libsigrok.git

diff --git a/src/hardware/microchip-pickit2/api.c b/src/hardware/microchip-pickit2/api.c
index d8a75728..79c79d3e 100644
--- a/src/hardware/microchip-pickit2/api.c
+++ b/src/hardware/microchip-pickit2/api.c
@@ -267,21 +267,27 @@ static int config_get(uint32_t key, GVariant **data,
 	(void)cg;
 
 	devc = sdi ? sdi->priv : NULL;
+	usb = sdi ? sdi->conn : NULL;
 
 	switch (key) {
 	case SR_CONF_CONN:
-		if (!sdi->conn)
+		if (!usb)
 			return SR_ERR_ARG;
-		usb = sdi->conn;
 		*data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
 		return SR_OK;
 	case SR_CONF_SAMPLERATE:
+		if (!devc)
+			return SR_ERR_ARG;
 		rate = devc->samplerates[devc->curr_samplerate_idx];
 		*data = g_variant_new_uint64(rate);
 		return SR_OK;
 	case SR_CONF_LIMIT_SAMPLES:
+		if (!devc)
+			return SR_ERR_ARG;
 		return sr_sw_limits_config_get(&devc->sw_limits, key, data);
 	case SR_CONF_CAPTURE_RATIO:
+		if (!devc)
+			return SR_ERR_ARG;
 		ratio = devc->captureratios[devc->curr_captureratio_idx];
 		*data = g_variant_new_uint64(ratio);
 		return SR_OK;