[asterisk-commits] jpeeler: branch 1.6.1 r138363 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Aug 15 20:14:34 2008
New Revision: 138363

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138363
Log:
Merged revisions 138361 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r138361 | jpeeler | 2008-08-15 20:13:26 -0500 (Fri, 15 Aug 2008) | 9 lines

Merged revisions 138360 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138360 | jpeeler | 2008-08-15 20:12:18 -0500 (Fri, 15 Aug 2008) | 1 line

fixes use count to properly decrement if an active dahdi channel is destroyed allowing module to be unloaded
........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Fri Aug 15 20:14:34 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311
+/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=138363&r1=138362&r2=138363
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Aug 15 20:14:34 2008
@@ -7645,6 +7645,7 @@
 			int x = DAHDI_FLASH;
 			ioctl(tmp->subs[SUB_REAL].dfd, DAHDI_HOOK, &x); /* important to create an event for dahdi_wait_event to register so that all ss_threads terminate */
 			destroy_channel(prev, tmp, 1);
+			ast_module_unref(ast_module_info->self);
 			return RESULT_SUCCESS;
 		}
 		prev = tmp;