diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/mgmt.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 608aa0f8bf7b..c959915d308e 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -4563,26 +4563,23 @@ void mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | |||
4563 | mgmt_pending_remove(cmd); | 4563 | mgmt_pending_remove(cmd); |
4564 | } | 4564 | } |
4565 | 4565 | ||
4566 | int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 4566 | void mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
4567 | u8 status) | 4567 | u8 status) |
4568 | { | 4568 | { |
4569 | struct pending_cmd *cmd; | 4569 | struct pending_cmd *cmd; |
4570 | struct mgmt_rp_pin_code_reply rp; | 4570 | struct mgmt_rp_pin_code_reply rp; |
4571 | int err; | ||
4572 | 4571 | ||
4573 | cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_NEG_REPLY, hdev); | 4572 | cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_NEG_REPLY, hdev); |
4574 | if (!cmd) | 4573 | if (!cmd) |
4575 | return -ENOENT; | 4574 | return; |
4576 | 4575 | ||
4577 | bacpy(&rp.addr.bdaddr, bdaddr); | 4576 | bacpy(&rp.addr.bdaddr, bdaddr); |
4578 | rp.addr.type = BDADDR_BREDR; | 4577 | rp.addr.type = BDADDR_BREDR; |
4579 | 4578 | ||
4580 | err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY, | 4579 | cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY, |
4581 | mgmt_status(status), &rp, sizeof(rp)); | 4580 | mgmt_status(status), &rp, sizeof(rp)); |
4582 | 4581 | ||
4583 | mgmt_pending_remove(cmd); | 4582 | mgmt_pending_remove(cmd); |
4584 | |||
4585 | return err; | ||
4586 | } | 4583 | } |
4587 | 4584 | ||
4588 | int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr, | 4585 | int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr, |