X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fprotocol.c;h=eea2f5bd427159faff0ee160f4474952659037e8;hb=0ab702601d6b855f162340da9a19b1885ee16253;hp=74326205042a48511e5a5a824152c5d058b7ca55;hpb=aa0dbd683c58c9dd342140a4080d2aa0b95c5bb3;p=libsigrok.git

diff --git a/hardware/alsa/protocol.c b/hardware/alsa/protocol.c
index 74326205..eea2f5bd 100644
--- a/hardware/alsa/protocol.c
+++ b/hardware/alsa/protocol.c
@@ -159,7 +159,7 @@ static void alsa_scan_handle_dev(GSList **devices,
 
 	for (i = 0; i < devc->num_probes; i++) {
 		snprintf(p_name, sizeof(p_name), "Ch_%d", i);
-		if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, p_name)))
+		if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, p_name)))
 			goto scan_error_cleanup;
 		sdi->probes = g_slist_append(sdi->probes, probe);
 	}
@@ -282,22 +282,6 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
 	return devices;
 }
 
-/*
- * Helper to be used with g_slist_free_full(); for properly freeing an alsa
- * dev instance.
- */
-SR_PRIV void alsa_dev_inst_clear(struct sr_dev_inst *sdi)
-{
-	struct dev_context *devc;
-
-	if (!(devc = sdi->priv))
-		return;
-
-	snd_pcm_hw_params_free(devc->hw_params);
-	g_free((void*)devc->samplerates);
-	sr_dev_inst_free(sdi);
-}
-
 /**
  * Set the samplerate of the ALSA device.
  *