Use 'kHz' (not 'KHz') consistently.

[libsigrok.git] / hardware / saleae-logic / saleae-logic.c

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 65e83aea362cea20bce7dab7ec6acfacd0d9aebb..07491fa085427889112e05bcb12b5e22a9773959 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -259,16 +259,17 @@ static int configure_probes(GSList *probes)
                        continue;
                probe_bit = 1 << (probe->index - 1);
                probe_mask |= probe_bit;
-               if (probe->trigger) {
-                       stage = 0;
-                       for (tc = probe->trigger; *tc; tc++) {
-                               trigger_mask[stage] |= probe_bit;
-                               if (*tc == '1')
-                                       trigger_value[stage] |= probe_bit;
-                               stage++;
-                               if (stage > NUM_TRIGGER_STAGES)
-                                       return SIGROK_ERR;
-                       }
+               if (!(probe->trigger))
+                       continue;
+
+               stage = 0;
+               for (tc = probe->trigger; *tc; tc++) {
+                       trigger_mask[stage] |= probe_bit;
+                       if (*tc == '1')
+                               trigger_value[stage] |= probe_bit;
+                       stage++;
+                       if (stage > NUM_TRIGGER_STAGES)
+                               return SIGROK_ERR;
                }
        }
 
@@ -510,7 +511,8 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        } else if (capability == HWCAP_PROBECONFIG) {
                ret = configure_probes((GSList *) value);
        } else if (capability == HWCAP_LIMIT_SAMPLES) {
-               limit_samples = strtoull(value, NULL, 10);
+               tmp_u64 = value;
+               limit_samples = *tmp_u64;
                ret = SIGROK_OK;
        } else {
                ret = SIGROK_ERR;