diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-16 13:46:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-16 13:46:06 -0700 |
| commit | 17e4d43eb6743a92d7667c822a3c3ecd63a9c58e (patch) | |
| tree | 894bbbf63726d7794001eaf15134c1215724ed5d /net/bluetooth/hci_conn.c | |
| parent | 542cc7937e6af73cb2edc455a0e456d22e254abb (diff) | |
| parent | 3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 61309b26f27..fa47d5d84f5 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -171,10 +171,8 @@ static void hci_conn_timeout(unsigned long arg) switch (conn->state) { case BT_CONNECT: case BT_CONNECT2: - if (conn->type == ACL_LINK) + if (conn->type == ACL_LINK && conn->out) hci_acl_connect_cancel(conn); - else - hci_acl_disconn(conn, 0x13); break; case BT_CONFIG: case BT_CONNECTED: @@ -292,6 +290,8 @@ int hci_conn_del(struct hci_conn *conn) hci_conn_del_sysfs(conn); + hci_dev_put(hdev); + return 0; } |