commit 324ee0fd8c275febb65d5cb5112f836f3c9a67e7
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 28 23:59:23 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 28 23:59:23 2018 +0000
tree f82469d2c58e744e3e333b6a34132ef703ea60e6
parent 132ee4413de959b48f7bb910f8ff4f384f3dcdf8
parent b3aa987518ac797990149447a6e344d3b971d373

Merge "mm-camera-interface: Avoid destroying mutex twice"

msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera.c

diff --git a/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera.c b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera.c
index 59e0ae4..ba5b6ef 100644
--- a/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera.c
+++ b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera.c
@@ -2551,7 +2551,7 @@
  * DESCRIPTION: mm camera debug interface
  *
  *==========================================================================*/
-pthread_mutex_t dbg_log_mutex;
+pthread_mutex_t dbg_log_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static int         cam_soft_assert     = 0;
 static FILE       *cam_log_fd          = NULL;
@@ -2782,7 +2782,6 @@
   void mm_camera_debug_open(void) {
     char         property_value[PROPERTY_VALUE_MAX] = {0};
 
-    pthread_mutex_init(&dbg_log_mutex, 0);
     mm_camera_set_dbg_log_properties();
 
     /* configure asserts */
@@ -2829,6 +2828,5 @@
       cam_log_fd = NULL;
     }
 
-    pthread_mutex_destroy(&dbg_log_mutex);
   }
 #endif