diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-07-01 15:45:19 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-07-01 15:45:19 +0000 |
| commit | e721c230bee364d3b716ee6b758b16610e041ed7 (patch) | |
| tree | d6e2d399ed50323c3306b0a0844176e241027624 | |
| parent | 45ac17696e044a6ece9bf6633b9f0d1177ae4d50 (diff) | |
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@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10017 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/wcb4xxp/base.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c index f36660d..4842440 100644 --- a/drivers/dahdi/wcb4xxp/base.c +++ b/drivers/dahdi/wcb4xxp/base.c @@ -103,10 +103,6 @@ static char *companding = "alaw"; #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, 25, 27, 28, 29, 30, 31, 31, 32, 31, 31, 30, 29, 28, 27, 25, 23, 22, @@ -2210,8 +2206,8 @@ static const char *b4xxp_echocan_name(const struct dahdi_chan *chan) 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, |