Skip to content

Commit

Permalink
HID: intel-ish-hid: ipc: use msleep_interrupt() for wait
Browse files Browse the repository at this point in the history
set_current_task() must be called before schedule_timeout(), for this
driver, in order to avoid incorrect usage, use msleep_interrupt()
instead.

Signed-off-by: Even Xu <even.xu@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Even Xu authored and Jiri Kosina committed Nov 16, 2016
1 parent 7ede704 commit e5b56aa
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/hid/intel-ish-hid/ipc/ipc.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,8 @@ static int ish_fw_reset_handler(struct ishtp_device *dev)
return 0;
}

#define TIMEOUT_FOR_HW_RDY_MS 300

/**
* ish_fw_reset_work_fn() - FW reset worker function
* @unused: not used
Expand All @@ -552,7 +554,7 @@ static void fw_reset_work_fn(struct work_struct *unused)
rv = ish_fw_reset_handler(ishtp_dev);
if (!rv) {
/* ISH is ILUP & ISHTP-ready. Restart ISHTP */
schedule_timeout(HZ / 3);
msleep_interruptible(TIMEOUT_FOR_HW_RDY_MS);
ishtp_dev->recvd_hw_ready = 1;
wake_up_interruptible(&ishtp_dev->wait_hw_ready);

Expand Down

0 comments on commit e5b56aa

Please sign in to comment.