X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmicrochip-pickit2%2Fapi.c;h=1fd107b1109fa08ee8c0f4ab00aea47a9fcdfd92;hb=e760f2cdafae1fe5331435fc17e0e4c1c10643f3;hp=41e7baa2e909e30f56463cf36a493d5405bdd3b3;hpb=bde6a99b33fd520152c05183f5b80cff63d75675;p=libsigrok.git

diff --git a/src/hardware/microchip-pickit2/api.c b/src/hardware/microchip-pickit2/api.c
index 41e7baa2..1fd107b1 100644
--- a/src/hardware/microchip-pickit2/api.c
+++ b/src/hardware/microchip-pickit2/api.c
@@ -42,7 +42,7 @@
  * - The current implementation silently accepts sample count limits beyond
  *   1024, just won't provide more than 1024 samples to the session. A
  *   future implementation could cap the settings upon reception. Apps
- *   like Pulseview may not be able to specify 1024, and pass 1000 or
+ *   like PulseView may not be able to specify 1024, and pass 1000 or
  *   2000 instead (the latter results in 1024 getting used).
  * - The manual suggests that users can assign names to devices. The
  *   current implementation supports conn= specs with USB VID:PID pairs
@@ -264,10 +264,10 @@ static int config_get(uint32_t key, GVariant **data,
 	struct sr_usb_dev_inst *usb;
 	uint64_t rate, ratio;
 
-	devc = sdi ? sdi->priv : NULL;
-	(void)devc;
 	(void)cg;
 
+	devc = sdi ? sdi->priv : NULL;
+
 	switch (key) {
 	case SR_CONF_CONN:
 		if (!sdi->conn)
@@ -296,10 +296,10 @@ static int config_set(uint32_t key, GVariant *data,
 	struct dev_context *devc;
 	int idx;
 
-	devc = sdi ? sdi->priv : NULL;
-
 	(void)cg;
 
+	devc = sdi ? sdi->priv : NULL;
+
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
 		if (!devc)
@@ -454,5 +454,4 @@ static struct sr_dev_driver microchip_pickit2_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(microchip_pickit2_driver_info);