diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-22 20:59:32 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-22 20:59:32 +0000 |
| commit | 06baf2773de21ddf74827caa15a4b3039e1b7343 (patch) | |
| tree | 4c095b3fef911fe9dc933a34e40ddbf26a7a5a4a /wct4xxp | |
| parent | 79394f1f6b51fca2e7bbda84fb64d02ba973e2e7 (diff) | |
Merged revisions 1887 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r1887 | kpfleming | 2007-01-22 14:59:03 -0600 (Mon, 22 Jan 2007) | 10 lines
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/trunk@1888 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 37ba35e..e084be3 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -3103,6 +3103,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) @@ -3136,7 +3137,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) || @@ -3148,6 +3149,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) || @@ -3159,8 +3161,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; } |