aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-02-19 10:38:06 -0500
committerMarcel Holtmann <marcel@holtmann.org>2015-02-19 11:05:09 -0500
commit94d52dad9ef31e178ccc141dfd8feb84cccde581 (patch)
tree672a104ba82890d9a91d2e638fbe3f833aa5f5a9 /net/bluetooth
parent3a6d576be9fe02b0c3ffa89ef6eac048e14eec84 (diff)
Bluetooth: Remove bogus check for pending mgmt Set HS command
The command handler for Set HS doesn't use mgmt_pending_add() so we can never have a pending Set HS command that mgmt_pending_find() would return. This patch removes an unnecessary lookup for it in the set_ssp() handler function. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 1b528dea9844..cc67d19a7cb8 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2116,8 +2116,7 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
2116 goto failed; 2116 goto failed;
2117 } 2117 }
2118 2118
2119 if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev) || 2119 if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev)) {
2120 mgmt_pending_find(MGMT_OP_SET_HS, hdev)) {
2121 err = cmd_status(sk, hdev->id, MGMT_OP_SET_SSP, 2120 err = cmd_status(sk, hdev->id, MGMT_OP_SET_SSP,
2122 MGMT_STATUS_BUSY); 2121 MGMT_STATUS_BUSY);
2123 goto failed; 2122 goto failed;