[svn-commits] mattf: branch 1.4 r2830 - in /branches/1.4: ./ wctdm24xxp/base.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Fri Aug 10 16:58:27 2007
New Revision: 2830

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

........
r2829 | mattf | 2007-08-10 16:54:56 -0500 (Fri, 10 Aug 2007) | 1 line

Make sure we permit MRM commands
........

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

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

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=2830&r1=2829&r2=2830
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Fri Aug 10 16:58:27 2007
@@ -3060,6 +3060,7 @@
 	newjiffies = jiffies + HZ/10;
 	while(((reg = wctdm_getctl(wc,0x0000)) & 0x00000001) && (newjiffies > jiffies));
 	printk("%s: New Reg: %08x!\n", wc->variety, reg);
+	wctdm_setctl(wc, 0x0000, 0xfffa0000);
 
 	
 	/* Configure watchdogs, access, etc */