aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-11-08 22:32:13 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-11-08 22:32:13 +0000
commit3f17f7ce08f9b3783e09ec2e23779f55803ffc4a (patch)
tree3b08479438ac293b978ba3d80ac6494cfab95470 /res
parentfb8bf2401f36a960395a6d042c5b628492212207 (diff)
Merged revisions 294312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r294312 | jpeeler | 2010-11-08 16:30:49 -0600 (Mon, 08 Nov 2010) | 1 line add missing unlock not present in 294277 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@294313 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_timing_timerfd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c
index c9922aabe..438603b55 100644
--- a/res/res_timing_timerfd.c
+++ b/res/res_timing_timerfd.c
@@ -228,6 +228,7 @@ static int timerfd_timer_disable_continuous(int handle)
/* No reason to do anything if we're not
* in continuous mode
*/
+ ao2_unlock(our_timer);
ao2_ref(our_timer, -1);
return 0;
}