diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2009-08-19 16:44:31 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-08-19 16:44:31 +0000 |
commit | 8326c1faa72044e72fd4095cd9f8eec960633a7b (patch) | |
tree | 62d4ca06887064d91296dfd06d959b6b3c0295b4 /drivers/dahdi/wctdm24xxp/base.c | |
parent | 0fa9e7ca9203ba1bcf29e39c85f6b7dbedda4629 (diff) |
Merged revisions 7038 via svnmerge from
https://origsvn.digium.com/svn/dahdi/linux/trunk
........
r7038 | kpfleming | 2009-08-19 11:40:13 -0500 (Wed, 19 Aug 2009) | 9 lines
Ensure that dahdi_scan correctly reports VPM presence.
The wct4xxp driver (for the dual/quad span T1/E1 cards) and the wcte12xp
driver (for the single span VoiceBus-based T1/E1 cards) did not properly
update the 'devicetype' field reported by dahdi_scan when a VPM was found
during the card startup process. As a result, dahdi_scan did not show that
a VPM was present on the card, even if it was.
........
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7039 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctdm24xxp/base.c')
-rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index e4f8bf1..f26fb9a 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -3265,9 +3265,9 @@ static void wctdm_post_initialize(struct wctdm *wc) } if (wc->vpm100) { - strncat(wc->span.devicetype, " with VPM100M", sizeof(wc->span.devicetype) - 1); + strncat(wc->span.devicetype, " (VPM100M)", sizeof(wc->span.devicetype) - 1); } else if (wc->vpmadt032) { - strncat(wc->span.devicetype, " with VPMADT032", sizeof(wc->span.devicetype) - 1); + strncat(wc->span.devicetype, " (VPMADT032)", sizeof(wc->span.devicetype) - 1); } } |