mutex: remove pthread_mutex_trylock

We don't need to call pthread_mutex_trylock to call pthread_mutex_unlock.
Just call pthread_mutex_unlock to ensure all mutexes are locked.

Change-Id: Id43c9fdddaa400454f9d462430ae90ecf25615c8

diff --git a/common/tdm_log.c b/common/tdm_log.c
index 348ea9997f6dd11519de8e9c74d8ee6fdb434e7f..4d4d5001144fb974e4b8f56b3258e6a0d547557a 100644 (file)
--- a/common/tdm_log.c
+++ b/common/tdm_log.c
@@ -224,6 +224,5 @@ tdm_log_print(int level, const char *fmt, ...)
 EXTERN void
 tdm_log_reset(void)
 {
-       pthread_mutex_trylock(&log_lock);
        pthread_mutex_unlock(&log_lock);
 }

diff --git a/src/tdm_thread.c b/src/tdm_thread.c
index 29d996ac55da6c21e70424e5e89ff1c09dcff4d9..4f4626fcd6f01c55079a02cd95f93377950e9e48 100644 (file)
--- a/src/tdm_thread.c
+++ b/src/tdm_thread.c
@@ -292,7 +292,6 @@ tdm_thread_deinit(tdm_private_loop *private_loop)
        _pthread_mutex_unlock(&private_display->lock);
        pthread_join(private_loop->private_thread->event_thread, NULL);
 
-       pthread_mutex_trylock(&cb_list_lock);
        pthread_mutex_unlock(&cb_list_lock);
        tdm_log_reset();