Restore inadvertantly removed line of code (bug #2218)

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

2 files changed, 6 insertions, 2 deletions

diff --git a/wcfxs.c b/wcfxs.c
index b59712b..48572e9 100755
--- a/wcfxs.c
+++ b/wcfxs.c
@@ -1448,6 +1448,7 @@ static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
 #else
 			zt_hooksig(&wc->chans[card], ZT_RXSIG_OFFHOOK);
 #endif
+			wc->mod.fxo.battery[card] = 1;
 			wc->mod.fxo.nobatttimer[card] = 0;
 			wc->mod.fxo.battdebounce[card] = BATT_DEBOUNCE;
 		} else if (wc->mod.fxo.battery[card])
@@ -1475,7 +1476,8 @@ static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
 	        wc->mod.fxo.polaritydebounce[card]--;
 		if (wc->mod.fxo.polaritydebounce[card] < 1) {
 		    if (wc->mod.fxo.lastpol[card] != wc->mod.fxo.polarity[card]) {
-			printk("%lu Polarity reversed (%d -> %d)\n", jiffies, 
+			if (debug)
+				printk("%lu Polarity reversed (%d -> %d)\n", jiffies, 
 			       wc->mod.fxo.polarity[card], 
 			       wc->mod.fxo.lastpol[card]);
 			if (wc->mod.fxo.polarity[card])
diff --git a/wctdm.c b/wctdm.c
index b59712b..48572e9 100755
--- a/wctdm.c
+++ b/wctdm.c
@@ -1448,6 +1448,7 @@ static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
 #else
 			zt_hooksig(&wc->chans[card], ZT_RXSIG_OFFHOOK);
 #endif
+			wc->mod.fxo.battery[card] = 1;
 			wc->mod.fxo.nobatttimer[card] = 0;
 			wc->mod.fxo.battdebounce[card] = BATT_DEBOUNCE;
 		} else if (wc->mod.fxo.battery[card])
@@ -1475,7 +1476,8 @@ static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
 	        wc->mod.fxo.polaritydebounce[card]--;
 		if (wc->mod.fxo.polaritydebounce[card] < 1) {
 		    if (wc->mod.fxo.lastpol[card] != wc->mod.fxo.polarity[card]) {
-			printk("%lu Polarity reversed (%d -> %d)\n", jiffies, 
+			if (debug)
+				printk("%lu Polarity reversed (%d -> %d)\n", jiffies, 
 			       wc->mod.fxo.polarity[card], 
 			       wc->mod.fxo.lastpol[card]);
 			if (wc->mod.fxo.polarity[card])