These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / isdn / capi / capidrv.c

diff --git a/kernel/drivers/isdn/capi/capidrv.c b/kernel/drivers/isdn/capi/capidrv.c
index 1cc6ca8..85cfa4f 100644 (file)
--- 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);