commit adf0f3b3b518e98fc1056e2788dd936e87331fb1
author Ravi Kumar Alamanda <ralama@codeaurora.org> Thu Jun 04 02:34:02 2015 -0700
committer Eric Laurent <elaurent@google.com> Fri Jun 05 08:40:25 2015 -0700
tree f3cbc36d124a25eed7529e2fa404cc5a623c3359
parent 33575cb966f196c38429e0fd52f80328cb1d9ac0

hal: Fix incorrect acdb_id selection for speaker protection

Enable right acdb_id for speaker protection usecase. Currently
it is sending calibration for speaker in speaker protection use
case.

Cherry-pick of CAF commit:
f16721c890f3423dcfba8f2b8bb342b3e84f23fd

Change-Id: I735f0ab39815cac99d11cc91c23a5220fbae87df

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 6712f3b..00f3c2d 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -937,7 +937,7 @@
     struct platform_data *my_data = (struct platform_data *)platform;
     int acdb_dev_id, acdb_dev_type;
 
-    acdb_dev_id = acdb_device_table[snd_device];
+    acdb_dev_id = acdb_device_table[audio_extn_get_spkr_prot_snd_device(snd_device)];
     if (acdb_dev_id < 0) {
         ALOGE("%s: Could not find acdb id for device(%d)",
               __func__, snd_device);