aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-07-30 19:52:02 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-07-30 19:52:02 +0200
commit5bad95c92dc7b974a793074ca173fe129d258fb7 (patch)
treeea06063be94c600650428530935b036f9e0f0107
parent05e253b357caca3cdeb274027c7627a8a59d190d (diff)
downloadpx4-firmware-5bad95c92dc7b974a793074ca173fe129d258fb7.tar.gz
px4-firmware-5bad95c92dc7b974a793074ca173fe129d258fb7.tar.bz2
px4-firmware-5bad95c92dc7b974a793074ca173fe129d258fb7.zip
make GCC happy
-rw-r--r--src/modules/mavlink/mavlink_main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 8c79a1fee..618b9fa29 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -743,7 +743,7 @@ Mavlink::send_message(const uint8_t msgid, const void *msg)
return;
}
- pthread_mutex_lock(_send_mutex);
+ pthread_mutex_lock(&_send_mutex);
int buf_free = get_free_tx_buf();
@@ -757,7 +757,8 @@ Mavlink::send_message(const uint8_t msgid, const void *msg)
/* no enough space in buffer to send */
count_txerr();
count_txerrbytes(packet_len);
- goto out;
+ pthread_mutex_unlock(&_send_mutex);
+ return;
}
uint8_t buf[MAVLINK_MAX_PACKET_LEN];
@@ -795,8 +796,7 @@ Mavlink::send_message(const uint8_t msgid, const void *msg)
count_txbytes(packet_len);
}
-out:
- pthread_mutex_unlock(_send_mutex);
+ pthread_mutex_unlock(&_send_mutex);
}
void