commit 550f6d33701c3f5ed5dd3ac40e9e1e6b5de680e5
author Ravi Kumar Alamanda <ralama@codeaurora.org> Thu Sep 24 02:15:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 24 02:15:27 2015 +0000
tree 66efcd5fe53ebdfd9fb98b31d975fdc67b06e6a6
parent 2cb23e903de5dd2db0a45dd89a158a7eac5052bd
parent 425e154c046554deb7ba766e89b943e8870ee251

am 425e154c: hal: msm8974: Conditional device switch to swap LR channels

* commit '425e154c046554deb7ba766e89b943e8870ee251':
  hal: msm8974: Conditional device switch to swap LR channels

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index b2d6fa2..83e2f91 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2441,14 +2441,24 @@
         list_for_each(node, &adev->usecase_list) {
             usecase = node_to_item(node, struct audio_usecase, list);
             if (usecase->type == PCM_PLAYBACK &&
-                usecase->stream.out->devices & AUDIO_DEVICE_OUT_SPEAKER) {
-                const char *mixer_path;
-                if (swap_channels) {
-                    mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER_REVERSE);
-                    audio_route_apply_and_update_path(adev->audio_route, mixer_path);
+                    usecase->stream.out->devices & AUDIO_DEVICE_OUT_SPEAKER) {
+                /*
+                 * If acdb tuning is different for SPEAKER_REVERSE, it is must
+                 * to perform device switch to disable the current backend to
+                 * enable it with new acdb data.
+                 */
+                if (acdb_device_table[SND_DEVICE_OUT_SPEAKER] !=
+                    acdb_device_table[SND_DEVICE_OUT_SPEAKER_REVERSE]) {
+                    select_devices(adev, usecase->id);
                 } else {
-                    mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER);
-                    audio_route_apply_and_update_path(adev->audio_route, mixer_path);
+                    const char *mixer_path;
+                    if (swap_channels) {
+                        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER_REVERSE);
+                        audio_route_apply_and_update_path(adev->audio_route, mixer_path);
+                    } else {
+                        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER);
+                        audio_route_apply_and_update_path(adev->audio_route, mixer_path);
+                    }
                 }
                 break;
             }