summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorAndre Guedes2011-05-31 19:20:55 +0200
committerGustavo F. Padovan2011-06-08 21:58:18 +0200
commit893d67514aebcfd3ebf17bd212ceea1e2741a443 (patch)
treef1c974727dd33f06c122958ecbc370f33a850806 /net/bluetooth/hci_conn.c
parentBluetooth: Add 'dst_type' field to struct hci_conn (diff)
downloadkernel-qcow2-linux-893d67514aebcfd3ebf17bd212ceea1e2741a443.tar.gz
kernel-qcow2-linux-893d67514aebcfd3ebf17bd212ceea1e2741a443.tar.xz
kernel-qcow2-linux-893d67514aebcfd3ebf17bd212ceea1e2741a443.zip
Bluetooth: Remove useless check in hci_connect()
There is no need to check the connection's state since hci_conn_add() has just created a new connection and its state has been set properly. Signed-off-by: Andre Guedes <andre.guedes@openbossa.org> Acked-by: Ville Tervo <ville.tervo@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r--net/bluetooth/hci_conn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index e67540216cd4..ca283a0f63ea 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -453,8 +453,8 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8
le = hci_conn_add(hdev, LE_LINK, dst);
if (!le)
return ERR_PTR(-ENOMEM);
- if (le->state == BT_OPEN)
- hci_le_connect(le);
+
+ hci_le_connect(le);
hci_conn_hold(le);