[asterisk-commits] jpeeler: branch 1.6.0 r138362 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Aug 15 20:14:11 2008
New Revision: 138362

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138362
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.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=138362&r1=138361&r2=138362
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Fri Aug 15 20:14:11 2008
@@ -7464,6 +7464,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;