diff options
| author | João Paulo Rechi Vita <jprvita@profusion.mobi> | 2010-06-22 13:56:28 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-07-21 10:39:10 -0700 |
| commit | 963cf687e825f7a59817f145a1ea19bdc224a18f (patch) | |
| tree | ce13f66353099e348226859d976998b1452ec493 /net | |
| parent | 7a560e5c99dc5f03e2c0dbe05ed20008af5d0bcf (diff) | |
| download | kernel_samsung_aries-963cf687e825f7a59817f145a1ea19bdc224a18f.zip kernel_samsung_aries-963cf687e825f7a59817f145a1ea19bdc224a18f.tar.gz kernel_samsung_aries-963cf687e825f7a59817f145a1ea19bdc224a18f.tar.bz2 | |
Bluetooth: Fix error return on L2CAP-HCI interface.
L2CAP only deals with ACL links. EINVAL should be returned otherwise.
Signed-off-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index de545f1..a3dfee9 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -4415,7 +4415,7 @@ static int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type) struct hlist_node *node; if (type != ACL_LINK) - return 0; + return -EINVAL; BT_DBG("hdev %s, bdaddr %s", hdev->name, batostr(bdaddr)); @@ -4448,7 +4448,7 @@ static int l2cap_connect_cfm(struct hci_conn *hcon, u8 status) BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status); if (hcon->type != ACL_LINK) - return 0; + return -EINVAL; if (!status) { conn = l2cap_conn_add(hcon, status); @@ -4477,7 +4477,7 @@ static int l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason) BT_DBG("hcon %p reason %d", hcon, reason); if (hcon->type != ACL_LINK) - return 0; + return -EINVAL; l2cap_conn_del(hcon, bt_err(reason)); |