aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-03-01 16:07:11 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-03-01 16:07:11 +0100
commit72a8ba074e39c385be51a5be44b907d65ba0a2d0 (patch)
tree8527ed6cee076900752ee3ec7444383b266e4a89 /apps
parentb7a510dfcb60708d8622d51d18c9fc83a5d32786 (diff)
parent433c9548589ebdc1ed40ab9f478b00f531b7bb47 (diff)
downloadpx4-firmware-72a8ba074e39c385be51a5be44b907d65ba0a2d0.tar.gz
px4-firmware-72a8ba074e39c385be51a5be44b907d65ba0a2d0.tar.bz2
px4-firmware-72a8ba074e39c385be51a5be44b907d65ba0a2d0.zip
Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c
Diffstat (limited to 'apps')
-rw-r--r--apps/uORB/uORB.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/uORB/uORB.cpp b/apps/uORB/uORB.cpp
index 41f399f2c..7abbf42ae 100644
--- a/apps/uORB/uORB.cpp
+++ b/apps/uORB/uORB.cpp
@@ -430,8 +430,10 @@ ORBDevNode::appears_updated(SubscriberData *sd)
irqstate_t state = irqsave();
/* check if this topic has been published yet, if not bail out */
- if (_data == nullptr)
+ if (_data == nullptr) {
ret = false;
+ goto out;
+ }
/*
* If the subscriber's generation count matches the update generation
@@ -489,6 +491,7 @@ ORBDevNode::appears_updated(SubscriberData *sd)
break;
}
+out:
irqrestore(state);
/* consider it updated */