Merged revisions 927 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r927 | markster | 2006-01-31 00:38:05 -0600 (Tue, 31 Jan 2006) | 3 lines

Fix compile warning in tdm2400p and make sure dmactrl is updated if vpm 
detected.

........


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@928 5390a7c7-147a-4af0-8ec9-7488f05a26cb

2 files changed, 3 insertions, 1 deletions

diff --git a/wct4xxp.c b/wct4xxp.c
index 59816dc..a928146 100644
--- a/wct4xxp.c
+++ b/wct4xxp.c
@@ -1703,6 +1703,8 @@ static int t4_startup(struct zt_span *span)
 	if (!alreadyrunning && !wc->vpm) {
 		wait_a_little();
 		t4_vpm_init(wc);
+		wc->dmactrl |= wc->vpm;
+		t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
 	}
 #endif
 	printk("Completed startup!\n");
diff --git a/wctdm24xxp.c b/wctdm24xxp.c
index dae289e..1c4786e 100644
--- a/wctdm24xxp.c
+++ b/wctdm24xxp.c
@@ -2462,7 +2462,7 @@ static void wctdm_vpm_init(struct wctdm *wc)
 	unsigned char reg;
 	unsigned int mask;
 	unsigned int ver;
-	unsigned char vpmver;
+	unsigned char vpmver=0;
 	unsigned int i, x, y;
 
 	if (!vpmsupport) {