Merge branch 'master' into cmake-2

This commit is contained in:
James Goppert
2015-09-24 16:03:28 -04:00
2 changed files with 5 additions and 4 deletions
+1 -1
Submodule NuttX updated: aa15c32058...3009fb230e
+4 -3
View File
@@ -98,6 +98,7 @@ UavcanServers::~UavcanServers()
if (_mutex_inited) {
(void)Lock::deinit(_subnode_mutex);
}
_main_node.getDispatcher().removeRxFrameListener();
}
@@ -164,9 +165,9 @@ int UavcanServers::start(uavcan::INode &main_node)
rv = pthread_create(&_instance->_subnode_thread, &tattr, static_cast<pthread_startroutine_t>(run_trampoline), NULL);
if (rv < 0) {
warnx("pthread_create() failed: %d", errno);
rv = -errno;
if (rv != 0) {
rv = -rv;
warnx("pthread_create() failed: %d", rv);
delete _instance;
_instance = nullptr;
}