diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-05 22:33:09 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-05 22:33:09 +0400 |
| commit | f2529c2cc80b72fcf889a9399e522b9648ab4d9e (patch) | |
| tree | 345c37f67d53f6b07a81fe5f625fe6af946359d5 /net/bluetooth/hci_conn.c | |
| parent | a0b8de350be458b33248e48b2174d9af8a4c4798 (diff) | |
| parent | 163f4dabea4e3be485c17e8f08e3a6468ad31cbf (diff) | |
| download | linux-f2529c2cc80b72fcf889a9399e522b9648ab4d9e.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index d3a05b9ade7a..bcd158f40bb9 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -393,6 +393,9 @@ int hci_conn_del(struct hci_conn *conn) hci_dev_put(hdev); + if (conn->handle == 0) + kfree(conn); + return 0; } |