Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c32fa93 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: Fix hidp_get_connection() 



This functions needs crtl_sock and intr_sock to be set first.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 25df0845

net/bluetooth/hidp/core.c

+6 −6
Original line number Diff line number Diff line
@@ -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);