[svn-commits] russell: branch 1.6.1 r164604 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec 16 08:18:45 2008
New Revision: 164604

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

........
r164602 | russell | 2008-12-16 08:17:45 -0600 (Tue, 16 Dec 2008) | 7 lines

Fix usage of the DAHDI_VMWI ioctl.

(closes issue #14090)
Reported by: alecdavis
Patches:
      chan_dahdi.VMWI_ioctl.diff.txt uploaded by alecdavis (license 585)

........

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

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

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=164604&r1=164603&r2=164604
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Tue Dec 16 08:18:45 2008
@@ -7994,7 +7994,7 @@
 								pthread_attr_t attr;
 								pthread_t threadid;
 								struct mwi_thread_data *mtd;
-								res2 = ioctl(last->subs[SUB_REAL].dfd, DAHDI_VMWI, res);
+								res2 = ioctl(last->subs[SUB_REAL].dfd, DAHDI_VMWI, &res);
 								if (res2) {
 									/* TODO: This message will ALWAYS be generated on some cards; any way to restrict it to those cards where it is interesting? */
 									ast_debug(3, "Unable to control message waiting led on channel %d: %s\n", last->channel, strerror(errno));