diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-20 20:47:07 -0400 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-20 20:47:07 -0400 |
| commit | 828d7d7b19446bf5a40928da47955c575a454c75 (patch) | |
| tree | fd006445c562749de9a07fe6e5363bab5d285a20 /net/bluetooth/hci_event.c | |
| parent | 26954c7f26068b6ced108806fdd39aee5cd54e6f (diff) | |
| parent | 069f40fc07f6df3da325e7ea1698a0d6247983d5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index c7eb073fe633..cb25628c0583 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
| @@ -2419,8 +2419,6 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s | |||
| 2419 | if (!conn) | 2419 | if (!conn) |
| 2420 | goto unlock; | 2420 | goto unlock; |
| 2421 | 2421 | ||
| 2422 | hci_conn_hold(conn); | ||
| 2423 | |||
| 2424 | conn->remote_cap = ev->capability; | 2422 | conn->remote_cap = ev->capability; |
| 2425 | conn->remote_oob = ev->oob_data; | 2423 | conn->remote_oob = ev->oob_data; |
| 2426 | conn->remote_auth = ev->authentication; | 2424 | conn->remote_auth = ev->authentication; |