[zaptel-commits] trunk - r858 in /trunk: ./ wctdm.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue Dec 13 13:09:06 2005
New Revision: 858

URL: http://svn.digium.com/view/zaptel?rev=858&view=rev
Log:
Merged revisions 857 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r857 | kpfleming | 2005-12-13 13:08:41 -0600 (Tue, 13 Dec 2005) | 2 lines

ensure data is output to proper io port address (issue #5990)

........

Modified:
    trunk/   (props changed)
    trunk/wctdm.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 13 13:09:06 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-855
+/branches/1.2:1-857

Modified: trunk/wctdm.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm.c?rev=858&r1=857&r2=858&view=diff
==============================================================================
--- trunk/wctdm.c (original)
+++ trunk/wctdm.c Tue Dec 13 13:09:06 2005
@@ -2057,7 +2057,7 @@
 	outb(0x30 | 0x01, wc->ioaddr + WC_CNTL);
 	
 	/* Make sure serial port and DMA are out of reset */
-	outb(inb(wc->ioaddr + WC_CNTL) & 0xf9, WC_CNTL);
+	outb(inb(wc->ioaddr + WC_CNTL) & 0xf9, wc->ioaddr + WC_CNTL);
 	
 	/* Configure serial port for MSB->LSB operation */
 	outb(0xc1, wc->ioaddr + WC_SERCTL);