aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hidp/core.c5
-rw-r--r--net/bluetooth/hidp/hidp.h1
2 files changed, 2 insertions, 4 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 9734136d6431..22e9ab1403a0 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -79,7 +79,7 @@ static void __hidp_copy_session(struct hidp_session *session, struct hidp_connin
79 bacpy(&ci->bdaddr, &session->bdaddr); 79 bacpy(&ci->bdaddr, &session->bdaddr);
80 80
81 ci->flags = session->flags; 81 ci->flags = session->flags;
82 ci->state = session->state; 82 ci->state = BT_CONNECTED;
83 83
84 ci->vendor = 0x0000; 84 ci->vendor = 0x0000;
85 ci->product = 0x0000; 85 ci->product = 0x0000;
@@ -970,7 +970,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
970 down_write(&hidp_session_sem); 970 down_write(&hidp_session_sem);
971 971
972 s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst); 972 s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst);
973 if (s && s->state == BT_CONNECTED) { 973 if (s) {
974 up_write(&hidp_session_sem); 974 up_write(&hidp_session_sem);
975 return -EEXIST; 975 return -EEXIST;
976 } 976 }
@@ -992,7 +992,6 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
992 992
993 session->ctrl_sock = ctrl_sock; 993 session->ctrl_sock = ctrl_sock;
994 session->intr_sock = intr_sock; 994 session->intr_sock = intr_sock;
995 session->state = BT_CONNECTED;
996 995
997 session->conn = hidp_get_connection(session); 996 session->conn = hidp_get_connection(session);
998 if (!session->conn) { 997 if (!session->conn) {
diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
index af1bcc823f26..57a6191674fd 100644
--- a/net/bluetooth/hidp/hidp.h
+++ b/net/bluetooth/hidp/hidp.h
@@ -135,7 +135,6 @@ struct hidp_session {
135 135
136 bdaddr_t bdaddr; 136 bdaddr_t bdaddr;
137 137
138 unsigned long state;
139 unsigned long flags; 138 unsigned long flags;
140 unsigned long idle_to; 139 unsigned long idle_to;
141 140