diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-22 20:59:03 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-22 20:59:03 +0000 |
| commit | bdecc82114154adc28d1f90ecb67483dfea2e51b (patch) | |
| tree | a38c78492874b5f3c13f607a716b15d15e5faf92 /wct4xxp | |
| parent | 7dd383f1946b198b8de1bbb08f1f06f03d16b120 (diff) | |
Merged revisions 1886 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1886 | kpfleming | 2007-01-22 14:58:30 -0600 (Mon, 22 Jan 2007) | 2 lines
might be good if i committed the working version of this code...
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@1887 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
| -rw-r--r-- | wct4xxp/base.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index 1047a77..bcee9ff 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -3098,6 +3098,7 @@ static void t4_vpm450_init(struct t4 *wc) unsigned int check1, check2; int laws[4] = { 0, }; int x; + unsigned int vpm_capacity; struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) @@ -3131,7 +3132,7 @@ static void t4_vpm450_init(struct t4 *wc) laws[x] = 1; } - switch (get_vpm450m_capacity(wc)) { + switch ((vpm_capacity = get_vpm450m_capacity(wc))) { case 64: #if defined(HOTPLUG_FIRMWARE) if ((request_firmware(&firmware, oct064_firmware, &wc->dev->dev) != 0) || @@ -3143,6 +3144,7 @@ static void t4_vpm450_init(struct t4 *wc) embedded_firmware.data = _binary_OCT6114D_64D_ima_start; embedded_firmware.size = _binary_OCT6114D_64D_ima_start; #endif + break; case 128: #if defined(HOTPLUG_FIRMWARE) if ((request_firmware(&firmware, oct128_firmware, &wc->dev->dev) != 0) || @@ -3154,8 +3156,9 @@ static void t4_vpm450_init(struct t4 *wc) embedded_firmware.data = _binary_OCT6114D_128D_ima_start; embedded_firmware.size = _binary_OCT6114D_128D_ima_start; #endif + break; default: - printk("Unsupported channel capacity found on VPM module.\n"); + printk("Unsupported channel capacity found on VPM module (%d).\n", vpm_capacity); return; } |