aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-10-15 11:31:00 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-16 02:14:31 -0400
commite86070c83e9110e89800274385c013db602b1444 (patch)
treeaa489bb9aa519018ea8eb31d07dd526a5ce19f98 /net/bluetooth
parent4c67bc74f016b0d360b8573e18969c0ff7926974 (diff)
[Bluetooth] Disconnect HID interrupt channel first
The Bluetooth HID specification demands that the interrupt channel shall be disconnected first. This is needed to pass the qualification tests. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hidp/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 03b5dadb4951..b2d6da67d885 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -510,11 +510,11 @@ static int hidp_session(void *arg)
510 if (intr_sk->sk_state != BT_CONNECTED) 510 if (intr_sk->sk_state != BT_CONNECTED)
511 wait_event_timeout(*(ctrl_sk->sk_sleep), (ctrl_sk->sk_state == BT_CLOSED), HZ); 511 wait_event_timeout(*(ctrl_sk->sk_sleep), (ctrl_sk->sk_state == BT_CLOSED), HZ);
512 512
513 fput(session->ctrl_sock->file); 513 fput(session->intr_sock->file);
514 514
515 wait_event_timeout(*(intr_sk->sk_sleep), (intr_sk->sk_state == BT_CLOSED), HZ); 515 wait_event_timeout(*(intr_sk->sk_sleep), (intr_sk->sk_state == BT_CLOSED), HZ);
516 516
517 fput(session->intr_sock->file); 517 fput(session->ctrl_sock->file);
518 518
519 __hidp_unlink_session(session); 519 __hidp_unlink_session(session);
520 520