[dahdi-commits] sruffell: linux/trunk r10017 - /linux/trunk/drivers/dahdi/wcb4xxp/base.c

[SVN commits to the DAHDI project]

Author: sruffell
Date: Fri Jul  1 10:45:19 2011
New Revision: 10017

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10017
Log:
wcb4xxp: Return NULL if there is not a hardware EC on installed.

r9943 enabled the presence of hardware EC to be probed on a card. That
change did not account for wcb4xxp based cards that did not have a
hardware echocan on board.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

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

Modified: linux/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=10017&r1=10016&r2=10017
==============================================================================
--- linux/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcb4xxp/base.c Fri Jul  1 10:45:19 2011
@@ -102,10 +102,6 @@
 
 #define MAX_B4_CARDS 64
 static struct b4xxp *cards[MAX_B4_CARDS];
-
-/* names of HWEC modules */
-static const char *lasvegas2_name = "LASVEGAS2";
-static const char *noec_name = "NONE";
 
 static int led_fader_table[] = {
 	 0,  0,  0,  1,  2,  3,  4,  6,  8,  9, 11, 13, 16, 18, 20, 22, 24,
@@ -2210,8 +2206,8 @@
 	struct b4xxp_span *bspan = container_of(chan->span, struct b4xxp_span,
 						span);
 	if (bspan->parent->card_type == B410P)
-		return lasvegas2_name;
-	return noec_name;
+		return "LASVEGAS2";
+	return NULL;
 }
 
 static int b4xxp_echocan_create(struct dahdi_chan *chan,