summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/uwb/drp.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/uwb/drp.c')
-rw-r--r--kernel/drivers/uwb/drp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/drivers/uwb/drp.c b/kernel/drivers/uwb/drp.c
index 8fc1b787d..38d0504a1 100644
--- a/kernel/drivers/uwb/drp.c
+++ b/kernel/drivers/uwb/drp.c
@@ -642,9 +642,7 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i
}
INIT_LIST_HEAD(&cnflt->rc_node);
- init_timer(&cnflt->timer);
- cnflt->timer.function = uwb_cnflt_timer;
- cnflt->timer.data = (unsigned long)cnflt;
+ setup_timer(&cnflt->timer, uwb_cnflt_timer, (unsigned long)cnflt);
cnflt->rc = rc;
INIT_WORK(&cnflt->cnflt_update_work, uwb_cnflt_update_work);