[svn-commits] kmoore: linux/trunk r9054 - /linux/trunk/drivers/dahdi/wctdm24xxp/base.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Thu Jul 29 16:51:53 2010
New Revision: 9054

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9054
Log:
wctdm24xxp: only allow B400M modules on hybrid cards

Modified:
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c

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=9054&r1=9053&r2=9054
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu Jul 29 16:51:53 2010
@@ -4813,6 +4813,13 @@
 			++curspan;
 			continue;
 		} else if (wc->modtype[i] == MOD_TYPE_BRI) {
+			if (!is_hx8(wc)) {
+				dev_info(&wc->vb.pdev->dev, "Digital modules "
+					"detected on a non-hybrid card. "
+					"This is unsupported.\n");
+				wctdm_back_out_gracefully(wc);
+				return -EIO;
+			}
 			wc->spans[curspan] = wctdm_init_span(wc, curspan, curchan, 3, 1);
 			if (!wc->spans[curspan]) {
 				wctdm_back_out_gracefully(wc);