Commit 22a3ceab authored Nov 19, 2014 by Johan Hedberg Committed by Marcel Holtmann Nov 19, 2014

Bluetooth: Fix setting state back to TASK_RUNNING

In __hci_cmd_sync_ev() and __hci_req_sync() if the hci_req_run() call
fails and we return from the functions we should ensure that the state
doesn't remain in TASK_INTERRUPTIBLE that we just set it to. This patch
fixes missing calls to set_current_state(TASK_RUNNING) in both places.

Reported-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Tested-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent a86c02ea

net/bluetooth/hci_core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1128,6 +1128,7 @@ struct sk_buff __hci_cmd_sync_ev(struct hci_dev hdev, u16 opcode, u32 plen,
		err = hci_req_run(&req, hci_req_sync_complete);
		if (err < 0) {
		remove_wait_queue(&hdev->req_wait_q, &wait);
		set_current_state(TASK_RUNNING);
		return ERR_PTR(err);
		}

		@@ -1196,6 +1197,7 @@ static int __hci_req_sync(struct hci_dev *hdev,
		hdev->req_status = 0;

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

		/* ENODATA means the HCI request command queue is empty.
		* This can happen when a request with conditionals doesn't