[svn-commits] sruffell: linux/trunk r6862 - in /linux/trunk/drivers/dahdi: ./ wct4xxp/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Jul 21 12:52:59 2009
New Revision: 6862

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6862
Log:
Revert "wct4xxp, wcte11xp: Use the default configuration by default at startup."

This reverts the change introduced by revision 6712.  This change can cause
problems when there is a VPM module installed on the quad-span digital cards.

Modified:
    linux/trunk/drivers/dahdi/wct4xxp/base.c
    linux/trunk/drivers/dahdi/wcte11xp.c

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=6862&r1=6861&r2=6862
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Tue Jul 21 12:52:59 2009
@@ -6,7 +6,7 @@
  * written by Jim Dixon <jim at lambdatel.com>.
  *
  * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
- * Copyright (C) 2001-2009, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium, Inc.
  *
  * All rights reserved.
  *
@@ -3544,12 +3544,6 @@
 	__t4_set_timing_source(wc,4, 0, 0);
 	spin_unlock_irqrestore(&wc->reglock, flags);
 	tasklet_init(&wc->t4_tlet, t4_isr_bh, (unsigned long)wc);
-
-	/* Start the first span on the card with the default configuration so
-	 * that it may provide timing to Asterisk before being properly
-	 * configured. */
-	t4_startup(&wc->tspans[0]->span);
-
 	return 0;
 }
 

Modified: linux/trunk/drivers/dahdi/wcte11xp.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/wcte11xp.c?view=diff&rev=6862&r1=6861&r2=6862
==============================================================================
--- linux/trunk/drivers/dahdi/wcte11xp.c (original)
+++ linux/trunk/drivers/dahdi/wcte11xp.c Tue Jul 21 12:52:59 2009
@@ -5,7 +5,7 @@
  *            Matthew Fredrickson <creslin at digium.com>
  *            William Meadows <wmeadows at digium.com>
  *
- * Copyright (C) 2004-2009, Digium, Inc.
+ * Copyright (C) 2004, Digium, Inc.
  *
  * All rights reserved.
  */
@@ -1012,11 +1012,6 @@
 		printk(KERN_NOTICE "Unable to register span with DAHDI\n");
 		return -1;
 	}
-
-	/* Start off with the defaults so this card can provide timing to
-	 * Asterisk before being properly configured. */
-	t1xxp_startup(&wc->span);
-
 	return 0;
 }