diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-30 21:30:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-30 21:30:39 -0700 |
| commit | b9caaabb995c6ff103e2457b9a36930b9699de7c (patch) | |
| tree | 5e2fd04c5eb07ae1373c5c64250056e902982fa8 /net/bluetooth/hci_event.c | |
| parent | fc57e515a2c02599b00d252545521288dfc0158a (diff) | |
| parent | 7e7430908c3ccaf71f0851050c8ccaf9ecfb3b56 (diff) | |
| download | op-kernel-dev-b9caaabb995c6ff103e2457b9a36930b9699de7c.zip op-kernel-dev-b9caaabb995c6ff103e2457b9a36930b9699de7c.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 184ba0a..e99fe38 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -887,6 +887,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s } else conn->state = BT_CONNECTED; + hci_conn_hold_device(conn); hci_conn_add_sysfs(conn); if (test_bit(HCI_AUTH, &hdev->flags)) @@ -1693,6 +1694,7 @@ static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_bu conn->handle = __le16_to_cpu(ev->handle); conn->state = BT_CONNECTED; + hci_conn_hold_device(conn); hci_conn_add_sysfs(conn); break; |
