Commit 53cce22d authored Mar 05, 2013 by Johan Hedberg Committed by Gustavo Padovan Mar 08, 2013

Bluetooth: Fix __hci_req_sync() handling of empty requests



If a request callback doesn't send any commands __hci_req_sync() should
fail imediately instead of waiting for the inevitable timeout to occur.
This is particularly important once we start creating requests with
conditional command sending which can potentially result in no commands
being sent at all.

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>

parent 01178cd4

net/bluetooth/hci_core.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,14 @@ static int __hci_req_sync(struct hci_dev *hdev,
		set_current_state(TASK_INTERRUPTIBLE);

		req(hdev, opt);

		/* If the request didn't send any commands return immediately */
		if (skb_queue_empty(&hdev->cmd_q) && atomic_read(&hdev->cmd_cnt)) {
		hdev->req_status = 0;
		remove_wait_queue(&hdev->req_wait_q, &wait);
		return err;
		}

		schedule_timeout(timeout);

		remove_wait_queue(&hdev->req_wait_q, &wait);

Admin message