X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Falsa.c;h=b6dd66c4ca0a92405bb2649a72dbdd397d1c167e;hb=341ce41545cab2bda88230c8434f36c64eadd8a1;hp=d4ee7bb163510698b38180cc50553429d3e9c2b1;hpb=d3683c42e74fa61c21fc0f1bf360ae201fc4b1d1;p=libsigrok.git

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index d4ee7bb1..b6dd66c4 100644
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -97,7 +97,7 @@ static int hw_opendev(int device_index)
 	struct alsa *alsa;
 	int err;
 
-	if (!(sdi = sr_get_dev_inst(device_instances, device_index)))
+	if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
 		return SR_ERR;
 	alsa = sdi->priv;
 
@@ -131,7 +131,7 @@ static int hw_closedev(int device_index)
 	struct sr_device_instance *sdi;
 	struct alsa *alsa;
 
-	if (!(sdi = sr_get_dev_inst(device_instances, device_index))) {
+	if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
 		sr_err("alsa: %s: sdi was NULL", __func__);
 		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
@@ -154,12 +154,11 @@ static int hw_cleanup(void)
 {
 	struct sr_device_instance *sdi;
 
-	if (!(sdi = sr_get_dev_inst(device_instances, 0))) {
+	if (!(sdi = sr_dev_inst_get(device_instances, 0))) {
 		sr_err("alsa: %s: sdi was NULL", __func__);
 		return SR_ERR_BUG;
 	}
 
-	g_free(sdi->priv);
 	sr_dev_inst_free(sdi);
 
 	return SR_OK;
@@ -171,7 +170,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 	struct alsa *alsa;
 	void *info = NULL;
 
-	if (!(sdi = sr_get_dev_inst(device_instances, device_index)))
+	if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
 		return NULL;
 	alsa = sdi->priv;
 
@@ -214,7 +213,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 	struct sr_device_instance *sdi;
 	struct alsa *alsa;
 
-	if (!(sdi = sr_get_dev_inst(device_instances, device_index)))
+	if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
 		return SR_ERR;
 	alsa = sdi->priv;
 
@@ -300,7 +299,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	int count;
 	int err;
 
-	if (!(sdi = sr_get_dev_inst(device_instances, device_index)))
+	if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
 		return SR_ERR;
 	alsa = sdi->priv;