]> sigrok.org Git - libsigrok.git/commitdiff
hameg-hmo: Make sure the enabled_channels list is empty before populating it
authorSoeren Apel <redacted>
Wed, 13 Aug 2014 14:33:38 +0000 (16:33 +0200)
committerBert Vermeulen <redacted>
Thu, 14 Aug 2014 20:43:57 +0000 (22:43 +0200)
Previous runs of dev_acquisition_start() keep the enabled_channels list
populated if they fail. This means that once an invalid channel
configuration was detected, it will be detected again even if the channel
configuration was changed. With this change, the list will be cleared
before being populated so that any stale entries are removed.

src/hardware/hameg-hmo/api.c

index c3d7005961b1a67bd14371840a304b13953bb557..7f3d5f549321e0cc6025ee16f7a20624b3da1e44 100644 (file)
@@ -727,6 +727,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc = sdi->priv;
        digital_added = FALSE;
 
+       g_slist_free(devc->enabled_channels);
+       devc->enabled_channels = NULL;
+
        for (l = sdi->channels; l; l = l->next) {
                ch = l->data;
                if (!ch->enabled)