X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=decode.c;h=67d8f1ef33c196310bfa24ee1a12f7663e2bbeeb;hp=cadd5ea74807092a6e2e1ec652403057f7b04db8;hb=09fc39da486b8618d65b66ca96a760478c3e89e2;hpb=662a1e27fa9573a35a6f9a6f699dee2be447826a

diff --git a/decode.c b/decode.c
index cadd5ea..67d8f1e 100644
--- a/decode.c
+++ b/decode.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include "sigrok-cli.h"
-#include "config.h"
 
 #ifdef HAVE_SRD
 static GHashTable *pd_ann_visible = NULL;
@@ -198,8 +198,7 @@ int register_pds(const char *opt_pds, char *opt_pd_annotations)
 		g_hash_table_destroy(options);
 	if (channels)
 		g_hash_table_destroy(channels);
-	if (pd_name)
-		g_free(pd_name);
+	g_free(pd_name);
 
 	return ret;
 }
@@ -215,7 +214,6 @@ static void map_pd_inst_channels(void *key, void *value, void *user_data)
 	void *channel_target;
 	struct sr_channel *ch;
 	GHashTableIter iter;
-	int num_channels;
 
 	channel_map = value;
 	channel_list = user_data;
@@ -246,8 +244,7 @@ static void map_pd_inst_channels(void *key, void *value, void *user_data)
 		g_hash_table_insert(channel_indices, g_strdup(channel_id), var);
 	}
 
-	num_channels = g_slist_length(channel_list);
-	srd_inst_channel_set_all(di, channel_indices, (num_channels + 7) / 8);
+	srd_inst_channel_set_all(di, channel_indices);
 }
 
 void map_pd_channels(struct sr_dev_inst *sdi)