summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/isdn/capi
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/isdn/capi')
-rw-r--r--kernel/drivers/isdn/capi/capidrv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/drivers/isdn/capi/capidrv.c b/kernel/drivers/isdn/capi/capidrv.c
index 1cc6ca8bf..85cfa4f86 100644
--- a/kernel/drivers/isdn/capi/capidrv.c
+++ b/kernel/drivers/isdn/capi/capidrv.c
@@ -2264,7 +2264,7 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
return -1;
}
card->owner = THIS_MODULE;
- init_timer(&card->listentimer);
+ setup_timer(&card->listentimer, listentimerfunc, (unsigned long)card);
strcpy(card->name, id);
card->contrnr = contr;
card->nbchan = profp->nbchannel;
@@ -2331,8 +2331,6 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
card->cipmask = 0x1FFF03FF; /* any */
card->cipmask2 = 0;
- card->listentimer.data = (unsigned long)card;
- card->listentimer.function = listentimerfunc;
send_listen(card);
mod_timer(&card->listentimer, jiffies + 60 * HZ);