Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10175e0f authored by Hemant Gupta's avatar Hemant Gupta Committed by Gerrit - the friendly Code Review server
Browse files

HID: uhid: Remove mutex_unlock while waiting 



Because of recently introduced kernel change, previous change to
unlock mutex is not required as HID device addition is now done in
worker thread instead of main thread. Previous code flow was blocking
as uhid_hid_set_report was called from main thread which is not the
case now. Previous code flow was
uhid_char_write->uhid_dev_create2->uhid_hid_raw_request->
uhid_hid_set_report->__uhid_report_queue_and_wait->
wait_event_interruptible_timeout which is now changed to
uhid_char_write->uhid_dev_create2.

CRs-Fixed: 1112380
Signed-off-by: default avatarHemant Gupta <hemantg@codeaurora.org>
Change-Id: I11c3e5628484739acc208deff84a82f34b1b7beb
parent 6649213f

drivers/hid/uhid.c

+0 −18
Original line number Diff line number Diff line
@@ -188,27 +188,9 @@ static int __uhid_report_queue_and_wait(struct uhid_device *uhid, 
	uhid_queue(uhid, ev);

	spin_unlock_irqrestore(&uhid->qlock, flags);



	/*

	 * Assumption: report_lock and devlock are both locked. So unlock

	 * before sleeping.

	 */

	mutex_unlock(&uhid->report_lock);

	mutex_unlock(&uhid->devlock);

	ret = wait_event_interruptible_timeout(uhid->report_wait,

				!uhid->report_running || !uhid->running,

				5 * HZ);

	ret = mutex_lock_interruptible(&uhid->devlock);

	if (ret)

		return ret;

	ret = mutex_lock_interruptible(&uhid->report_lock);

	if (ret) {

		/*

		 * Failed to lock, unlock previous mutex before exiting

		 * this function.

		 */

		mutex_unlock(&uhid->devlock);

		return ret;

	}

	if (!ret || !uhid->running || uhid->report_running)

		ret = -EIO;

	else if (ret < 0)