commit c6b15b07c9646e7df02195a125e79d0ddb0e3583
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 27 19:10:04 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 27 19:10:04 2015 -0700
tree 10fcb6a205afd019a2a9bbde281d8043ed84eada
parent f7fc698cc1d7df83e67014bc893188b6d88d425d
parent e675595a10020e45c91a9a3e362da2001e0275ee

Merge "hal: Add support for 24 bit playback for internal codec"

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index e061fdc..043615d 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -3290,8 +3290,15 @@
     ALOGV("%s bit width: %d, sample rate: %d", __func__, bit_width, sample_rate);
 
     int ret = 0;
+    const char *snd_card_name = mixer_get_name(adev->mixer);
     if (bit_width != adev->cur_codec_backend_bit_width) {
-        const char * mixer_ctl_name = "SLIM_0_RX Format";
+        const char * mixer_ctl_name;
+        if (!strncmp(snd_card_name, "msm8952-tomtom-snd-card",
+                 sizeof("msm8952-tomtom-snd-card"))) {
+            mixer_ctl_name = "SLIM_0_RX Format";
+        }
+        else
+            mixer_ctl_name = "MI2S_RX Format";
         struct  mixer_ctl *ctl;
         ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
         if (!ctl) {