X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fapi.c;h=9bb2ce251ff29e3ce2116aa9c5f1983317b52710;hb=21d464a7e53efc9ac9810d9301a12b6a56fdb061;hp=69a78ad2f022fa545b3a9ae206c008f054c1b7c8;hpb=6078d2c99619233173d4536b74258c15e6be73ba;p=libsigrok.git

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index 69a78ad2..9bb2ce25 100644
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -36,22 +36,27 @@ static const int32_t hwcaps[] = {
 SR_PRIV struct sr_dev_driver alsa_driver_info;
 static struct sr_dev_driver *di = &alsa_driver_info;
 
-static int clear_instances(void)
+static void clear_helper(void *priv)
 {
-	struct drv_context *drvc;
+	struct dev_context *devc;
 
-	if (!(drvc = di->priv))
-		return SR_OK;
+	devc = priv;
 
-	g_slist_free_full(drvc->instances, (GDestroyNotify)alsa_dev_inst_clear);
-	drvc->instances = NULL;
+	snd_pcm_hw_params_free(devc->hw_params);
+	devc->hw_params = NULL;
 
-	return SR_OK;
+	g_free((void *)devc->samplerates);
+	devc->samplerates = NULL;
+}
+
+static int dev_clear(void)
+{
+	return std_dev_clear(di, clear_helper);
 }
 
 static int init(struct sr_context *sr_ctx)
 {
-	return std_hw_init(sr_ctx, di, LOG_PREFIX);
+	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)
@@ -106,12 +111,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 	if (devc->capture_handle) {
 		sr_dbg("Closing PCM device.");
-		if ((ret = snd_pcm_close(devc->capture_handle)) < 0) {
+		if ((ret = snd_pcm_close(devc->capture_handle)) < 0)
 			sr_err("Failed to close device: %s.",
 			       snd_strerror(ret));
-			devc->capture_handle = NULL;
-            sdi->status = SR_ST_INACTIVE;
-		}
+		devc->capture_handle = NULL;
+		sdi->status = SR_ST_INACTIVE;
 	} else {
 		sr_dbg("No capture handle, no need to close audio device.");
 	}
@@ -121,9 +125,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-	clear_instances();
-
-	return SR_OK;
+	return dev_clear();
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
@@ -325,7 +327,7 @@ SR_PRIV struct sr_dev_driver alsa_driver_info = {
 	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = clear_instances,
+	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,