commit c0e87d6158c61f5d6660f956ba4a1b7def00b79b
author Eric Laurent <elaurent@google.com> Fri Feb 10 20:24:21 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 10 20:24:23 2017 +0000
tree b2befdf9d3f5648027fb4235c886d43035a70baf
parent 8ec8923a74bb79b8f7cd8a10503dc194f8788dc9
parent 0e46adf26c0fe46dc3accfc3f08a3106f3c110a7

Merge "audio HAL: add support for MMAP no IRQ mode streams."

hal/audio_extn/tfa_98xx.c

diff --git a/hal/audio_extn/tfa_98xx.c b/hal/audio_extn/tfa_98xx.c
index 6e9253a..41523b5 100644
--- a/hal/audio_extn/tfa_98xx.c
+++ b/hal/audio_extn/tfa_98xx.c
@@ -512,7 +512,6 @@
         ret = data->set_speaker_calibration(0);
         if (ret) {
             ALOGE("%s: exTfa98xx_calibration return %d\n", __func__, ret);
-            goto err_init;
         }
 
         ret = tfa_98xx_set_audio_mode(I2S_CLOCK_DISABLE, adev, Audio_Mode_Music_Normal);

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index bce1f64..3deac03 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -120,7 +120,7 @@
     bool speaker_lr_swap;
 
     void *acdb_handle;
-#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996)
+#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998)
     acdb_init_v2_cvd_t acdb_init;
 #elif defined (PLATFORM_MSM8084)
     acdb_init_v2_t acdb_init;
@@ -982,7 +982,7 @@
         return 0;
     }
 
-#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996)
+#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998)
     char *cvd_version = calloc(1, MAX_CVD_VERSION_STRING_SIZE);
     if (!cvd_version)
         ALOGE("failed to allocate cvd_version");
@@ -1261,7 +1261,7 @@
             ALOGV("%s: Could not find the symbol acdb_loader_send_gain_dep_cal from %s",
                   __func__, LIB_ACDB_LOADER);
 
-#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996)
+#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998)
         acdb_init_v2_cvd_t acdb_init;
         acdb_init = (acdb_init_v2_cvd_t)dlsym(my_data->acdb_handle,
                                               "acdb_loader_init_v2");