diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-22 16:21:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-22 16:21:38 -0400 |
| commit | 1ed3aad141fe595673c20225a9e004730088be52 (patch) | |
| tree | dec75e69b602e677ba0e5231f2d3036663fbd66a /net/bluetooth/hci_event.c | |
| parent | f01cb5fbea1c1613621f9f32f385e12c1a29dde0 (diff) | |
| parent | 069f40fc07f6df3da325e7ea1698a0d6247983d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 cebe7588469..b2570159a04 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
| @@ -2387,8 +2387,6 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s | |||
| 2387 | if (!conn) | 2387 | if (!conn) |
| 2388 | goto unlock; | 2388 | goto unlock; |
| 2389 | 2389 | ||
| 2390 | hci_conn_hold(conn); | ||
| 2391 | |||
| 2392 | conn->remote_cap = ev->capability; | 2390 | conn->remote_cap = ev->capability; |
| 2393 | conn->remote_oob = ev->oob_data; | 2391 | conn->remote_oob = ev->oob_data; |
| 2394 | conn->remote_auth = ev->authentication; | 2392 | conn->remote_auth = ev->authentication; |