From f6e9885b6add856471db9d3ce6f8723f5658d13d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 8 Mar 2016 20:54:31 +0100 Subject: [PATCH] capmt: change the lock order (clang sanitizer) --- src/descrambler/capmt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c index 796f405fd..5a7223260 100644 --- a/src/descrambler/capmt.c +++ b/src/descrambler/capmt.c @@ -2098,8 +2098,8 @@ capmt_service_start(caclient_t *cac, service_t *s) tuner = lfe->lfe_adapter->la_dvb_number; #endif - pthread_mutex_lock(&t->s_stream_mutex); pthread_mutex_lock(&capmt->capmt_mutex); + pthread_mutex_lock(&t->s_stream_mutex); LIST_FOREACH(ct, &capmt->capmt_services, ct_link) /* skip, if we already have this service */ @@ -2199,8 +2199,8 @@ capmt_service_start(caclient_t *cac, service_t *s) tvh_cond_signal(&capmt->capmt_cond, 0); fin: - pthread_mutex_unlock(&capmt->capmt_mutex); pthread_mutex_unlock(&t->s_stream_mutex); + pthread_mutex_unlock(&capmt->capmt_mutex); if (change) capmt_notify_server(capmt, NULL, 0); -- 2.47.3