diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-10-20 21:21:34 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-11-07 20:24:55 +0100 |
| commit | 3c32fa93e5a54cd54e52541892857b0c7164a61e (patch) | |
| tree | 304d6f5d0fcab11f40416c123a1f22a91fc8308e /net/bluetooth | |
| parent | Bluetooth: hidp: Fix module reference cleanup (diff) | |
| download | linux-3c32fa93e5a54cd54e52541892857b0c7164a61e.tar.xz linux-3c32fa93e5a54cd54e52541892857b0c7164a61e.zip | |
Bluetooth: Fix hidp_get_connection()
This functions needs crtl_sock and intr_sock to be set first.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hidp/core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 56dc660d234a..3c2d888925d7 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -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); |