summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hidp/core.c
diff options
context:
space:
mode:
authorMarcel Holtmann2006-10-15 17:31:00 +0200
committerDavid S. Miller2006-10-16 08:14:31 +0200
commite86070c83e9110e89800274385c013db602b1444 (patch)
treeaa489bb9aa519018ea8eb31d07dd526a5ce19f98 /net/bluetooth/hidp/core.c
parent[Bluetooth] Support concurrent connect requests (diff)
downloadkernel-qcow2-linux-e86070c83e9110e89800274385c013db602b1444.tar.gz
kernel-qcow2-linux-e86070c83e9110e89800274385c013db602b1444.tar.xz
kernel-qcow2-linux-e86070c83e9110e89800274385c013db602b1444.zip
[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/hidp/core.c')
-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)
if (intr_sk->sk_state != BT_CONNECTED)
wait_event_timeout(*(ctrl_sk->sk_sleep), (ctrl_sk->sk_state == BT_CLOSED), HZ);
- fput(session->ctrl_sock->file);
+ fput(session->intr_sock->file);
wait_event_timeout(*(intr_sk->sk_sleep), (intr_sk->sk_state == BT_CLOSED), HZ);
- fput(session->intr_sock->file);
+ fput(session->ctrl_sock->file);
__hidp_unlink_session(session);