Post-merged fix on "resolved conflicts for merge of f993a9c4 to mnc-dr-dev-plus-aosp"

Change-Id: Ia45ab5a0b5f4fac85db5a8c91980077b50b76513

diff --git a/audio_a2dp_hw/audio_a2dp_hw.c b/audio_a2dp_hw/audio_a2dp_hw.c
index 910e60f..4c8eca5 100644 (file)
--- a/audio_a2dp_hw/audio_a2dp_hw.c
+++ b/audio_a2dp_hw/audio_a2dp_hw.c
@@ -692,14 +692,14 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
 
     INFO("state %d", out->common.state);
 
-    pthread_mutex_lock(&out->common.lock);
-
     hash_map_t *params = hash_map_utils_new_from_string_params(kvpairs);
-
     int status = 0;
+
     if (!params)
       return status;
 
+    pthread_mutex_lock(&out->common.lock);
+
     /* dump params */
     hash_map_utils_dump_string_keys_string_values(params);