[dahdi-commits] fjoe: freebsd/trunk r9206 - in /freebsd/trunk: ./ drivers/dahdi/wct4xxp/base.c

[SVN commits to the DAHDI project]

Author: fjoe
Date: Mon Aug 30 03:56:25 2010
New Revision: 9206

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9206
Log:
Merge from linux trunk up to rev. 9205.

Modified:
    freebsd/trunk/   (props changed)
    freebsd/trunk/drivers/dahdi/wct4xxp/base.c

Propchange: freebsd/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 30 03:56:25 2010
@@ -1,1 +1,1 @@
-/linux/trunk:7418-9190
+/linux/trunk:7418-9205

Modified: freebsd/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=9206&r1=9205&r2=9206
==============================================================================
--- freebsd/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wct4xxp/base.c Mon Aug 30 03:56:25 2010
@@ -3280,11 +3280,13 @@
 			alarms |= DAHDI_ALARM_LMFA;
 	}
 
-	/* Check to ensure the transformer isn't busted */
-	if (unlikely((d & FRS1_XLO) || (d & FRS1_XLS))) {
-		dev_info(&wc->dev->dev,
-			"Detected a possible hardware malfunction"\
-			" this card may need servicing\n");
+	if (unlikely(debug)) {
+		/* Check to ensure the xmit line isn't shorted */
+		if (unlikely(d & FRS1_XLS)) {
+			dev_info(&wc->dev->dev,
+				"Detected a possible hardware malfunction"\
+				" this card may need servicing\n");
+		}
 	}
 
 	if (((!ts->span.alarms) && alarms) ||