[svn-commits] sruffell: linux/trunk r9928 - in /linux/trunk: drivers/dahdi/wctdm24xxp/ incl...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Jun  2 15:00:29 2011
New Revision: 9928

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9928
Log:
wctdm24xxp: Check if the FXS signaling setting is valid.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=9928&r1=9927&r2=9928
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu Jun  2 15:00:29 2011
@@ -1742,6 +1742,11 @@
 			x = (POLARITY_XOR(card)) ?
 					SLIC_LF_RING_OPEN :
 					SLIC_LF_TIP_OPEN;
+			break;
+		default:
+			WARN_ONCE(1, "%x is an invalid signaling state for "
+				  "an FXS module.\n",
+				  wc->aspan->span.chans[card]->sig);
 			break;
 		}
 		break;

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=9928&r1=9927&r2=9928
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Thu Jun  2 15:00:29 2011
@@ -1395,6 +1395,12 @@
 #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 #endif
 
+/* WARN_ONCE first showed up in the kernel in 2.6.27 but it may have been
+ * backported. */
+#ifndef WARN_ONCE
+#define WARN_ONCE(condition, format...) WARN_ON_ONCE(condition)
+#endif
+
 #define	DAHDI_CTL	0
 #define	DAHDI_TRANSCODE	250
 #define	DAHDI_TIMER	253