commit 4cdd524c59830b3ffa023099dd9dabe1844c5fcd
author Chaithanya Krishna Bacharaju <chaithan@codeaurora.org> Mon Sep 18 14:00:17 2017 +0530
committer Garmond Leung <garmondl@codeaurora.org> Wed Oct 04 16:34:13 2017 -0700
tree d6816e4c2cc44476732cfdee7df40bde51534669
parent eb487888e6b8fbbf62eafc3b1f949838571ded0c

hal: Reset FFV handle to null in deinit

FFV stream init is calling stream deinit as FFV handle is
non-NULL due to previously assigned value.Reset FFV handle
to null in deinit to avoid such issues.

Change-Id: I23200b52d4ba081d391dccfc9f195c3b308a1577

hal/audio_extn/ffv.c

diff --git a/hal/audio_extn/ffv.c b/hal/audio_extn/ffv.c
index fa55b5a..cb4978f 100644
--- a/hal/audio_extn/ffv.c
+++ b/hal/audio_extn/ffv.c
@@ -461,8 +461,8 @@
 
     num_ec_ref_ch = ffvmod.ec_ref_config.channels;
     num_tx_in_ch = ffvmod.split_ec_ref_data ?
-      (ffvmod.capture_config.channels - num_ec_ref_ch) :
-      ffvmod.capture_config.channels;
+        (ffvmod.capture_config.channels - num_ec_ref_ch) :
+        ffvmod.capture_config.channels;
     num_out_ch = ffvmod.out_config.channels;
     frame_len = ffvmod.capture_config.period_size;
     sample_rate = ffvmod.capture_config.rate;
@@ -548,6 +548,7 @@
     if (ffvmod.buffers_allocated)
         deallocate_buffers();
 
+    ffvmod.handle = NULL;
     ffvmod.in = NULL;
     ALOGV("%s: exit", __func__);
     return 0;
@@ -614,6 +615,9 @@
         goto exit;
     }
 
+    ALOGV("%s: Opening PCM device card_id(%d) device_id(%d), channels %d format %d",
+          __func__, adev->snd_card, ffvmod.ec_ref_pcm_id, ffvmod.ec_ref_config.channels,
+          ffvmod.ec_ref_config.format);
     ffvmod.ec_ref_pcm = pcm_open(adev->snd_card,
                              ffvmod.ec_ref_pcm_id,
                              PCM_IN, &ffvmod.ec_ref_config);
@@ -623,6 +627,7 @@
         goto exit;
     }
 
+    ALOGV("%s: pcm_prepare", __func__);
     if (pcm_prepare(ffvmod.ec_ref_pcm) < 0) {
         ALOGE("%s: pcm prepare for ec ref loopback failed", __func__);
         ret = -EINVAL;