commit 438932f53a0e1aa3987828e07a19ea39b1db6827
author Garmond Leung <garmondl@codeaurora.org> Wed Oct 04 19:35:18 2017 -0700
committer Garmond Leung <garmondl@codeaurora.org> Wed Oct 04 19:35:18 2017 -0700
tree 25adfd60671186e9d21a3bd0cb126f85ebd958a5
parent 003ee7576e203d93e826ccf2f59b084d35d1462b

hal: Correct compilation errors in hal

Correct compilation errors due to merge of new changes

Change-Id: I83cea7c5d672d24b81bbb767eafc3e1564be561a

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 32eb459..d1538de 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2060,12 +2060,9 @@
     int ret = 0;
     struct audio_usecase *uc_info;
     struct audio_device *adev = in->dev;
-    int snd_card_status;
     struct pcm_config config = in->config;
-    int usecase;
+    int usecase = platform_update_usecase_from_source(in->source,in->usecase);
 
-    snd_card_status = get_snd_card_state(adev);
-    usecase = platform_update_usecase_from_source(in->source,in->usecase);
     if (get_usecase_from_list(adev, usecase) == NULL)
         in->usecase = usecase;
     ALOGD("%s: enter: stream(%p)usecase(%d: %s)",
@@ -2166,7 +2163,7 @@
 
         while (1) {
             in->pcm = pcm_open(adev->snd_card, in->pcm_device_id,
-                               flags, &in->config);
+                               flags, &config);
             if (in->pcm == NULL || !pcm_is_ready(in->pcm)) {
                 ALOGE("%s: %s", __func__, pcm_get_error(in->pcm));
                 if (in->pcm != NULL) {
@@ -3773,13 +3770,6 @@
         goto exit;
     }
 
-    if (out->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) {
-        channels = platform_edid_get_max_channels(out->dev->platform);
-        if (audio_extn_passthru_is_enabled() &&
-            !out->is_iec61937_info_available &&
-            audio_extn_passthru_is_passthrough_stream(out)) {
-            audio_extn_passthru_update_stream_configuration(adev, out,
-                    buffer, bytes);
     if ((out->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) &&
          !out->is_iec61937_info_available) {
 
@@ -3824,7 +3814,6 @@
                     goto exit;
             }
         }
-       }
     }
 
     if ((out->devices & AUDIO_DEVICE_OUT_ALL_A2DP) &&