tdm_private_output_change_handler *h = NULL, *hh = NULL;
tdm_private_output_destroy_handler *dh = NULL, *dhh = NULL;
tdm_error ret;
+ int mutex_locked = 0;
ret = tdm_output_call_thread_cb_destroy(private_output);
TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
free(dh);
}
+ if (tdm_thread_is_running() && TDM_MUTEX_IS_LOCKED()) mutex_locked = 1;
if (private_output->vblank) {
/* tdm_vblank APIs is for server. it should be called in unlock status*/
- _pthread_mutex_unlock(&private_display->lock);
+ if (mutex_locked) _pthread_mutex_unlock(&private_display->lock);
tdm_vblank_destroy(private_output->vblank);
- _pthread_mutex_lock(&private_display->lock);
+ if (mutex_locked) _pthread_mutex_lock(&private_display->lock);
}
if (private_output->ttrace_vblank) {
/* tdm_vblank APIs is for server. it should be called in unlock status*/
- _pthread_mutex_unlock(&private_display->lock);
+ if (mutex_locked) _pthread_mutex_unlock(&private_display->lock);
tdm_vblank_destroy(private_output->ttrace_vblank);
- _pthread_mutex_lock(&private_display->lock);
+ if (mutex_locked) _pthread_mutex_lock(&private_display->lock);
}
LIST_FOR_EACH_ENTRY_SAFE(c, cc, &private_output->capture_list, link)
if (!module) {
TDM_ERR("%s", dlerror());
TDM_TRACE_END();
- ret = TDM_ERROR_BAD_MODULE;
+ ret = TDM_ERROR_NO_MODULE;
goto failed_load;
}
goto failed_load;
ret = _tdm_display_load_modules(private_display);
- if (ret != TDM_ERROR_NONE)
+ if (!(ret == TDM_ERROR_NONE || ret == TDM_ERROR_NO_MODULE))
goto failed_load;
stamp2 = tdm_helper_get_time();