aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-11-03 18:17:05 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-11-03 18:17:05 +0100
commit8d4ec9b9cd7b6479217bab97694a1eae15b2cebb (patch)
tree54fe234601c88ff1bce11880d8aafbceff8adf63 /src/modules
parentba0687bc5e471809ae311ef98f3ddda3c29713b4 (diff)
parentbfbdc445fb39b576617309076881ece9e5dc6c1d (diff)
downloadpx4-firmware-8d4ec9b9cd7b6479217bab97694a1eae15b2cebb.tar.gz
px4-firmware-8d4ec9b9cd7b6479217bab97694a1eae15b2cebb.tar.bz2
px4-firmware-8d4ec9b9cd7b6479217bab97694a1eae15b2cebb.zip
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/uORB/uORB.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/uORB/uORB.cpp b/src/modules/uORB/uORB.cpp
index 7abbf42ae..149b8f6d2 100644
--- a/src/modules/uORB/uORB.cpp
+++ b/src/modules/uORB/uORB.cpp
@@ -249,8 +249,10 @@ ORBDevNode::close(struct file *filp)
} else {
SubscriberData *sd = filp_to_sd(filp);
- if (sd != nullptr)
+ if (sd != nullptr) {
+ hrt_cancel(&sd->update_call);
delete sd;
+ }
}
return CDev::close(filp);