commit 390724db4159ced615331cfb9dbaa8dd848de34e
author Sujin Panicker <spanic@codeaurora.org> Fri Apr 26 10:43:36 2019 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 07 04:33:26 2019 -0700
tree 840d9212275d23c7ead3ff92ccef74514f9958c0
parent 8e69c4adeb546f641b182f39b94a8fd7f1d091a1

hal: Fix VTS errors

Deinit speaker protection thread(Cirrus)
before deinit of platform to avoid usage of
platform NULL pointer for further underlying
function calls.

Add a check to handle NULL pointer if VTS testcases
does not open a usecase.

Change-Id: I300a9b47e80e0d8349a15ed17533e62b2e7bf214

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 1cb3c1d..4f46a69 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2934,8 +2934,6 @@
     /* deinit usb */
     audio_extn_usb_deinit();
     audio_extn_dap_hal_deinit();
-    if (audio_extn_spkr_prot_is_enabled())
-        audio_extn_spkr_prot_deinit();
 #ifdef DYNAMIC_LOG_ENABLED
     log_utils_deinit();
 #endif
@@ -3503,7 +3501,7 @@
             list_for_each(node, &(platform->adev)->usecase_list) {
                  usecase = node_to_item(node, struct audio_usecase, list);
 
-                 if (is_offload_usecase(usecase->id) &&
+                 if (usecase->stream.out && is_offload_usecase(usecase->id) &&
                     (usecase->stream.out->devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
                     usecase->stream.out->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) &&
                     OUTPUT_SAMPLING_RATE_44100 == usecase->stream.out->sample_rate) {
@@ -7807,7 +7805,8 @@
         list_for_each(node, &adev->usecase_list) {
             usecase = node_to_item(node, struct audio_usecase, list);
 
-            if (usecase != NULL && usecase->type == PCM_PLAYBACK) {
+            if (usecase != NULL && usecase->stream.out &&
+                                   usecase->type == PCM_PLAYBACK) {
                 int new_snd_device[2] = {0};
                 int i, num_devices = 1;
 
@@ -8306,7 +8305,7 @@
 
     list_for_each(node, &adev->usecase_list) {
         usecase = node_to_item(node, struct audio_usecase, list);
-        if (usecase->type == PCM_PLAYBACK &&
+        if (usecase->stream.out && usecase->type == PCM_PLAYBACK &&
                 usecase->stream.out->devices & AUDIO_DEVICE_OUT_SPEAKER) {
             /*
              * If acdb tuning is different for SPEAKER_REVERSE, it is must