[svn-commits] kpfleming: trunk r1955 - in /trunk: ./ wcfxo.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jan 24 07:16:33 2007
New Revision: 1955

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1955
Log:
Merged revisions 1954 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1954 | kpfleming | 2007-01-24 07:11:19 -0600 (Wed, 24 Jan 2007) | 10 lines

Merged revisions 1953 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1953 | kpfleming | 2007-01-24 07:01:36 -0600 (Wed, 24 Jan 2007) | 2 lines

might as well fix this driver too :-)

........

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

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Jan 24 07:16:33 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954

Modified: trunk/wcfxo.c
URL: http://svn.digium.com/view/zaptel/trunk/wcfxo.c?view=diff&rev=1955&r1=1954&r2=1955
==============================================================================
--- trunk/wcfxo.c (original)
+++ trunk/wcfxo.c Wed Jan 24 07:16:33 2007
@@ -407,7 +407,6 @@
 #endif
 
 	ints = inb(wc->ioaddr + WC_INTSTAT);
-	outb(ints, wc->ioaddr + WC_INTSTAT);
 
 
 	if (!ints)
@@ -416,6 +415,8 @@
 #else
 		return;
 #endif		
+
+	outb(ints, wc->ioaddr + WC_INTSTAT);
 
 	if (ints & 0x0c) {  /* if there is a rx interrupt pending */
 #ifdef ENABLE_TASKLETS