1 files changed, 1 insertions, 4 deletions

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 4bbacddeb49d..782a22602b86 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -811,10 +811,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
         session->intr_sock = intr_sock;
         session->state     = BT_CONNECTED;
 
-        init_timer(&session->timer);
-
-        session->timer.function = hidp_idle_timeout;
-        session->timer.data     = (unsigned long) session;
+        setup_timer(&session->timer, hidp_idle_timeout, (unsigned long)session);
 
         skb_queue_head_init(&session->ctrl_transmit);
         skb_queue_head_init(&session->intr_transmit);