diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-20 15:56:44 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-20 15:56:44 -0400 |
| commit | 10e99777e926907e43fa57ec1208c3f7787fd290 (patch) | |
| tree | 75fce1859c07c2671871f6d20ff93c71a0baa94a /net/bluetooth/hci_event.c | |
| parent | 2232d31bf18ba02f5cd632bbfc3466aeca394c75 (diff) | |
| parent | a429b51930e64dd355840c37251a563000d7c10b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-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 cebe7588469f..b2570159a044 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; |