[zaptel-commits] mattf: branch 1.4 r2681 - in /branches/1.4: ./ wct4xxp/base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Tue Jul  3 11:46:57 2007
New Revision: 2681

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

........
r2680 | mattf | 2007-07-03 11:39:34 -0500 (Tue, 03 Jul 2007) | 1 line

Fix for span shutdown issue
........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wct4xxp/base.c

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

Modified: branches/1.4/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wct4xxp/base.c?view=diff&rev=2681&r1=2680&r2=2681
==============================================================================
--- branches/1.4/wct4xxp/base.c (original)
+++ branches/1.4/wct4xxp/base.c Tue Jul  3 11:46:57 2007
@@ -2876,6 +2876,21 @@
 	if (wc->intcount < 20)
 		printk("2G: Pre-interrupt\n");
 #endif
+
+	spin_lock_irqsave(&wc->reglock, flags);
+
+	if (wc->stopdma) {
+		/* Stop DMA cleanly if requested */
+		wc->dmactrl = 0x0;
+		__t4_pci_out(wc, WC_DMACTRL, 0x00000000);
+		/* Acknowledge any pending interrupts */
+		__t4_pci_out(wc, WC_INTR, 0x00000000);
+		__t4_set_timing_source(wc, 4, 0, 0);
+		wc->stopdma = 0x0;
+	}
+
+	spin_unlock_irqrestore(&wc->reglock, flags);
+
 	
 	inirq = 1;
 	/* Make sure it's really for us */
@@ -2893,7 +2908,6 @@
 #ifdef ENABLE_WORKQUEUES
 	t4_pci_out(wc, WC_INTR, status & 0x00000008);
 #endif
-
 	if (!wc->spansstarted) {
 		printk("Not prepped yet!\n");
 #ifdef LINUX26
@@ -3034,15 +3048,6 @@
 
 	if (wc->checktiming > 0)
 		__t4_set_timing_source_auto(wc);
-	if (wc->stopdma) {
-		/* Stop DMA cleanly if requested */
-		wc->dmactrl = 0x0;
-		__t4_pci_out(wc, WC_DMACTRL, 0x00000000);
-		/* Acknowledge any pending interrupts */
-		__t4_pci_out(wc, WC_INTR, 0x00000000);
-		__t4_set_timing_source(wc, 4, 0, 0);
-		wc->stopdma = 0x0;
-	}
 	spin_unlock_irqrestore(&wc->reglock, flags);
 
 	if (needcheckvpm450 && (vpmdtmfsupport == 1)) {