aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-04-24 16:17:16 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-04-24 16:17:16 +0200
commitbe0824c20704bc1a47fd57611cd7fba4a535df8c (patch)
tree7bf706fbe9123b1703d430a217f4528f060b5518 /src
parent8bb1b39399eb09ddf93c2682713d80be4f776c5d (diff)
parent8102c5a460e2d3af8556fdaf6cd8698132cbd718 (diff)
downloadpx4-firmware-be0824c20704bc1a47fd57611cd7fba4a535df8c.tar.gz
px4-firmware-be0824c20704bc1a47fd57611cd7fba4a535df8c.tar.bz2
px4-firmware-be0824c20704bc1a47fd57611cd7fba4a535df8c.zip
Merge remote-tracking branch 'upstream/master' into geo
Diffstat (limited to 'src')
-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 a9f5f4de7..227e99b48 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -574,6 +574,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;