commit 78cc98d75f35c5d80961cf68ca927a205b27b024
author Linux Build Service Account <lnxbuild@localhost> Sat Jun 13 19:51:18 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jun 13 19:51:18 2015 -0700
tree ffb77d217ee7febc5a05e87cdb554eaa32e2d183
parent cfbb3775591d1bbd517c3e82a6f36369cf9943b4
parent b2ee62c344b7c3f9dbceda856f918425b4d35aed

Merge "hal: spk_prot: fix initial calibration fail with usecase retry"

hal/audio_extn/spkr_protection.c

diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index 312be97..669842e 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -476,8 +476,6 @@
         handle.pcm_tx = NULL;
         /* Clear TX calibration to handset mic */
         if (disable_tx) {
-            uc_info_tx->id = USECASE_AUDIO_RECORD;
-            uc_info_tx->type = PCM_CAPTURE;
             uc_info_tx->in_snd_device = SND_DEVICE_IN_HANDSET_MIC;
             uc_info_tx->out_snd_device = SND_DEVICE_NONE;
             platform_send_audio_calibration(adev->platform,
@@ -871,8 +869,6 @@
 exit:
    /* Clear VI feedback cal and replace with handset MIC  */
     if (disable_tx) {
-        uc_info_tx->id = USECASE_AUDIO_RECORD;
-        uc_info_tx->type = PCM_CAPTURE;
         uc_info_tx->in_snd_device = SND_DEVICE_IN_HANDSET_MIC;
         uc_info_tx->out_snd_device = SND_DEVICE_NONE;
         platform_send_audio_calibration(adev->platform,