Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327460
b: refs/heads/master
c: 71becf0
h: refs/heads/master
v: v3
  • Loading branch information
Andrei Emeltchenko authored and Gustavo Padovan committed Aug 6, 2012
1 parent 1cc0a7f commit 3754044
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e8c7e36fb216d2d072116de3bec6130627ad691
refs/heads/master: 71becf0cea91380200ab9460e5126aeff5d7420b
6 changes: 2 additions & 4 deletions trunk/include/net/bluetooth/hci_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -581,17 +581,15 @@ void hci_conn_put_device(struct hci_conn *conn);

static inline void hci_conn_hold(struct hci_conn *conn)
{
BT_DBG("hcon %p refcnt %d -> %d", conn, atomic_read(&conn->refcnt),
atomic_read(&conn->refcnt) + 1);
BT_DBG("hcon %p orig refcnt %d", conn, atomic_read(&conn->refcnt));

atomic_inc(&conn->refcnt);
cancel_delayed_work(&conn->disc_work);
}

static inline void hci_conn_put(struct hci_conn *conn)
{
BT_DBG("hcon %p refcnt %d -> %d", conn, atomic_read(&conn->refcnt),
atomic_read(&conn->refcnt) - 1);
BT_DBG("hcon %p orig refcnt %d", conn, atomic_read(&conn->refcnt));

if (atomic_dec_and_test(&conn->refcnt)) {
unsigned long timeo;
Expand Down

0 comments on commit 3754044

Please sign in to comment.