|
@@ -996,12 +996,6 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
- session->conn = hidp_get_connection(session);
|
|
|
- if (!session->conn) {
|
|
|
- err = -ENOTCONN;
|
|
|
- goto failed;
|
|
|
- }
|
|
|
-
|
|
|
bacpy(&session->bdaddr, &bt_sk(ctrl_sock->sk)->dst);
|
|
|
|
|
|
session->ctrl_mtu = min_t(uint, l2cap_pi(ctrl_sock->sk)->chan->omtu,
|
|
@@ -1015,6 +1009,12 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
|
|
|
session->intr_sock = intr_sock;
|
|
|
session->state = BT_CONNECTED;
|
|
|
|
|
|
+ session->conn = hidp_get_connection(session);
|
|
|
+ if (!session->conn) {
|
|
|
+ err = -ENOTCONN;
|
|
|
+ goto failed;
|
|
|
+ }
|
|
|
+
|
|
|
setup_timer(&session->timer, hidp_idle_timeout, (unsigned long)session);
|
|
|
|
|
|
skb_queue_head_init(&session->ctrl_transmit);
|