aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Kirienko <pavel.kirienko@gmail.com>2015-01-19 15:54:14 +0300
committerLorenz Meier <lm@inf.ethz.ch>2015-01-21 14:54:24 +0100
commit4baf4a032fa87a01863ae475d4ad27496c90db86 (patch)
treeabb0446101b9564aa2cb4d1ac4f5e39092a8e57c
parent91362223ea5dc5badc34870210c356eb47ebd59d (diff)
downloadpx4-firmware-4baf4a032fa87a01863ae475d4ad27496c90db86.tar.gz
px4-firmware-4baf4a032fa87a01863ae475d4ad27496c90db86.tar.bz2
px4-firmware-4baf4a032fa87a01863ae475d4ad27496c90db86.zip
Fixed: Passing this->_armed_sub to close, which cannot accept a negative number.
-rw-r--r--src/modules/uavcan/uavcan_main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/uavcan/uavcan_main.cpp b/src/modules/uavcan/uavcan_main.cpp
index af5f2ec96..5b961e2ef 100644
--- a/src/modules/uavcan/uavcan_main.cpp
+++ b/src/modules/uavcan/uavcan_main.cpp
@@ -513,7 +513,7 @@ UavcanNode::teardown()
_control_subs[i] = -1;
}
}
- return ::close(_armed_sub);
+ return (_armed_sub >= 0) ? ::close(_armed_sub) : 0;
}
int