dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into cmake-2

This commit is contained in:
James Goppert 2015-09-24 16:03:28 -04:00
parent fa69a4f1e0 05a08252ff
commit bc1063c862
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NuttX

@ -1 +1 @@
Subproject commit aa15c32058acbda4cc2ee51e97d31e9e49225193
Subproject commit 3009fb230ec8232c4c4fd7798fd70ea9632692ec

7
src/modules/uavcan/uavcan_servers.cpp
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;
}