summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2011-01-21 05:27:49 +0000
committerShaun Ruffell <sruffell@digium.com>2011-01-21 05:27:49 +0000
commitafc385daa57164b7d845cda1e1a392a2c6d0ef7f (patch)
treedcedbc2d146f2996ded84a36c2a606eae05d86b6
parent84ca4243f8ed98ef7993fdadba5f0a687d4f23e2 (diff)
wcte11xp, wcte12xp: Fix a long-standing issue with shutdown
Upon shutdown, both drivers would attempt to power down external interfaces, but never attempted to bring them back up when the span was restarted. Removing that code allows the driver to work properly until a better solution can be found. Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9316 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9657 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/wcte11xp.c1
-rw-r--r--drivers/dahdi/wcte12xp/base.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c
index 10d2a9a..3a1eef2 100644
--- a/drivers/dahdi/wcte11xp.c
+++ b/drivers/dahdi/wcte11xp.c
@@ -918,7 +918,6 @@ static int t1xxp_shutdown(struct dahdi_span *span)
unsigned long flags;
spin_lock_irqsave(&wc->lock, flags);
- __t1_framer_out(wc, 0x46, 0x41); /* GCR: Interrupt on Activation/Deactivation of AIX, LOS */
__t1xxp_stop_dma(wc);
__t1xxp_disable_interrupts(wc);
span->flags &= ~DAHDI_FLAG_RUNNING;
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c
index f67c3b6..fd60c9a 100644
--- a/drivers/dahdi/wcte12xp/base.c
+++ b/drivers/dahdi/wcte12xp/base.c
@@ -984,7 +984,6 @@ static int t1xxp_startup(struct dahdi_span *span)
static int t1xxp_shutdown(struct dahdi_span *span)
{
struct t1 *wc = container_of(span, struct t1, span);
- t1_setreg(wc, 0x46, 0x41); /* GCR: Interrupt on Activation/Deactivation of AIX, LOS */
clear_bit(DAHDI_FLAGBIT_RUNNING, &span->flags);
return 0;
}