From 780848f273b6690b897464a0bab0324eb6c9e7bc Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 3 Jan 2012 19:25:46 +0000 Subject: wctdm24xxp: Fix bug if hook state on FXS changes before channel configuration. If the hook state on an FXS port changes before the channel is configured with dahdi_cfg it is possible to erroneously force the line feed register open without setting a timer to clear it. The result would be a "dead" channel that cannot be cleared unless the driver is reloaded and warning in the kernel log that "0 is an invalid signaling state for an FXS module". This change makes the OFF_HOOK to ON_HOOK change behave just as the ON_HOOK to OFF_HOOK change has. Internal-Issue-ID: DAHLIN-272 Reported-and-Tested-by: Tzafrir Cohen Signed-off-by: Shaun Ruffell git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10396 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wctdm24xxp/base.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 73398d7..75123c8 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -2256,20 +2256,16 @@ wctdm_fxs_hooksig(struct wctdm *wc, struct wctdm_module *const mod, switch (txsig) { case DAHDI_TXSIG_ONHOOK: switch (get_dahdi_chan(wc, mod)->sig) { - case DAHDI_SIG_EM: - case DAHDI_SIG_FXOKS: - case DAHDI_SIG_FXOLS: - x = fxs->idletxhookstate; - break; case DAHDI_SIG_FXOGS: x = (POLARITY_XOR(fxs)) ? SLIC_LF_RING_OPEN : SLIC_LF_TIP_OPEN; break; + case DAHDI_SIG_EM: + case DAHDI_SIG_FXOKS: + case DAHDI_SIG_FXOLS: default: - WARN_ONCE(1, "%x is an invalid signaling state for " - "an FXS module.\n", - get_dahdi_chan(wc, mod)->sig); + x = fxs->idletxhookstate; break; } break; -- cgit v1.2.3