diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index c1568a7..92f534f 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -774,10 +774,8 @@
                 else
                     app_type = DEFAULT_APP_TYPE_RX_PATH;
 
-                if (audio_extn_spkr_prot_is_enabled())
-                    acdb_dev_id = audio_extn_spkr_prot_get_acdb_id(usecase->out_snd_device);
-                else
-                    acdb_dev_id = acdb_device_table[usecase->out_snd_device];
+                acdb_dev_id =
+                    acdb_device_table[audio_extn_get_spkr_prot_snd_device(usecase->out_snd_device)];
 
                 if (!my_data->acdb_send_gain_dep_cal(acdb_dev_id, app_type,
                                                      acdb_dev_type, mode, level)) {
@@ -1864,20 +1862,18 @@
 {
     struct platform_data *my_data = (struct platform_data *)platform;
     int acdb_dev_id, acdb_dev_type;
-    int snd_device = SND_DEVICE_OUT_SPEAKER;
+    int snd_device = usecase->out_snd_device;
     int new_snd_device[SND_DEVICE_OUT_END] = {0};
     int i, num_devices = 1;
 
     if (!platform_supports_app_type_cfg()) // use v1 instead
         return -ENOSYS;
 
-    if (usecase->type == PCM_PLAYBACK)
-        snd_device = usecase->out_snd_device;
-    else if (usecase->type == PCM_CAPTURE)
+    if ((usecase->type == PCM_HFP_CALL) || (usecase->type == PCM_CAPTURE))
         snd_device = usecase->in_snd_device;
 
     // skipped over get_spkr_prot_device
-    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);
@@ -1890,7 +1886,7 @@
     }
 
     for (i = 0; i < num_devices; i++) {
-        acdb_dev_id = acdb_device_table[new_snd_device[i]];
+        acdb_dev_id = acdb_device_table[audio_extn_get_spkr_prot_snd_device(new_snd_device[i])];
         if (acdb_dev_id < 0) {
             ALOGE("%s: Could not find acdb id for device(%d)",
                   __func__, new_snd_device[i]);