summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorJohan Hedberg2013-09-16 12:05:13 +0200
committerGustavo Padovan2013-09-18 23:41:07 +0200
commitdc280801da1006cd9c702cfaae7ae677fdbc5b53 (patch)
treeb6bf83bd64d013e957addee332d960046449e0d6 /net/bluetooth/l2cap_core.c
parentBluetooth: Remove unused event mask struct (diff)
downloadkernel-qcow2-linux-dc280801da1006cd9c702cfaae7ae677fdbc5b53.tar.gz
kernel-qcow2-linux-dc280801da1006cd9c702cfaae7ae677fdbc5b53.tar.xz
kernel-qcow2-linux-dc280801da1006cd9c702cfaae7ae677fdbc5b53.zip
Bluetooth: Fix double error response for l2cap_create_chan_req
When an L2CAP request handler returns non-zero the calling code will send a command reject response. The l2cap_create_chan_req function will in some cases send its own response but then still return a -EFAULT error which would cause two responses to be sent. This patch fixes this by making the function return 0 after sending its own response. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index b3bb7bca8e60..0b8a2704928e 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4462,7 +4462,7 @@ error:
l2cap_send_cmd(conn, cmd->ident, L2CAP_CREATE_CHAN_RSP,
sizeof(rsp), &rsp);
- return -EFAULT;
+ return 0;
}
static void l2cap_send_move_chan_req(struct l2cap_chan *chan, u8 dest_amp_id)