summaryrefslogtreecommitdiff
path: root/wcte12xp/vpmadt032.c
diff options
context:
space:
mode:
authormspiceland <mspiceland@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-12-11 00:53:29 +0000
committermspiceland <mspiceland@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-12-11 00:53:29 +0000
commit94a59c9ad966f862efe678c67117a50f06d5baeb (patch)
tree5ddcb263d3e98cfd598aae2021dd99b9bf925604 /wcte12xp/vpmadt032.c
parentb64c19dbefb782de46f2a82adf4aa28ab67e78bd (diff)
Reverting changes from 3405 so that I can do this the correct way.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3411 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcte12xp/vpmadt032.c')
-rw-r--r--wcte12xp/vpmadt032.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/wcte12xp/vpmadt032.c b/wcte12xp/vpmadt032.c
index 90af94c..ca15e7c 100644
--- a/wcte12xp/vpmadt032.c
+++ b/wcte12xp/vpmadt032.c
@@ -641,7 +641,7 @@ static void vpm150m_dtmf_bh(struct work_struct *data)
return;
}
-int t1_vpm150m_init(struct t1 *wc) {
+void t1_vpm150m_init(struct t1 *wc) {
struct vpm150m *vpm150m;
unsigned short i;
unsigned short reg;
@@ -666,14 +666,14 @@ int t1_vpm150m_init(struct t1 *wc) {
if (!vpmsupport) {
module_printk("VPM Support Disabled\n");
wc->vpm150m = NULL;
- return 0; /* not fatal for the card */
+ return;
}
vpm150m = kmalloc(sizeof(struct vpm150m), GFP_KERNEL);
if (!vpm150m) {
module_printk("Unable to allocate VPMADT032!\n");
- return -1;
+ return;
}
memset(vpm150m, 0, sizeof(struct vpm150m));
@@ -873,7 +873,7 @@ int t1_vpm150m_init(struct t1 *wc) {
if ((request_firmware(&firmware, vpmadt032_firmware, &wc->dev->dev) != 0) ||
!firmware) {
printk("VPMADT032: firmware %s not available from userspace\n", vpmadt032_firmware);
- return -1;
+ return;
}
#else
embedded_firmware.data = _binary_vpmadt032_bin_start;
@@ -942,7 +942,7 @@ int t1_vpm150m_init(struct t1 *wc) {
goto failed_exit;
}
- return 0;
+ return;
failed_exit:
spin_lock_irqsave(&wc->reglock, flags);
@@ -950,7 +950,7 @@ failed_exit:
spin_unlock_irqrestore(&wc->reglock, flags);
kfree(vpm150m);
- return -1;
+ return;
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -