aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-04-22 09:58:07 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-04-22 09:58:07 +0200
commit2ecaab98f955380775c4b7f3583d9b0e3c62cccb (patch)
treed9b644aad4c1ac8531e1ce1e50ca94b39d5baa32 /src/modules/mavlink
parentaf56e65a37bf32cf3c6f1c0eb90626d61127c559 (diff)
parentaefea1a95d221e541be219d9fec7eece3c72fd50 (diff)
downloadpx4-firmware-2ecaab98f955380775c4b7f3583d9b0e3c62cccb.tar.gz
px4-firmware-2ecaab98f955380775c4b7f3583d9b0e3c62cccb.tar.bz2
px4-firmware-2ecaab98f955380775c4b7f3583d9b0e3c62cccb.zip
Merge branch 'master' of github.com:PX4/Firmware into ekf_params
Diffstat (limited to 'src/modules/mavlink')
-rw-r--r--src/modules/mavlink/mavlink_main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 2d71bdce6..a483691a3 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -583,6 +583,11 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *
/* open uart */
_uart_fd = open(uart_name, O_RDWR | O_NOCTTY);
+ if (_uart_fd < 0) {
+ return _uart_fd;
+ }
+
+
/* Try to set baud rate */
struct termios uart_config;
int termios_state;