p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HID: intel-ish-hid: ipc: use msleep_interrupt() for wait 

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>
This commit is contained in:
Even Xu 2016-11-11 09:40:33 +08:00 committed by Jiri Kosina
parent 7ede704d74
commit e5b56aa790
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hid/intel-ish-hid/ipc/ipc.c
View File

@ -539,6 +539,8 @@ static int ish_fw_reset_handler(struct ishtp_device *dev)
return 0; return 0;
} }
#define TIMEOUT_FOR_HW_RDY_MS 300
/** /**
* ish_fw_reset_work_fn() - FW reset worker function * ish_fw_reset_work_fn() - FW reset worker function
* @unused: not used * @unused: not used
@ -552,7 +554,7 @@ static void fw_reset_work_fn(struct work_struct *unused)
rv = ish_fw_reset_handler(ishtp_dev); rv = ish_fw_reset_handler(ishtp_dev);
if (!rv) { if (!rv) {
/* ISH is ILUP & ISHTP-ready. Restart ISHTP */ /* ISH is ILUP & ISHTP-ready. Restart ISHTP */
schedule_timeout(HZ / 3); msleep_interruptible(TIMEOUT_FOR_HW_RDY_MS);
ishtp_dev->recvd_hw_ready = 1; ishtp_dev->recvd_hw_ready = 1;
wake_up_interruptible(&ishtp_dev->wait_hw_ready); wake_up_interruptible(&ishtp_dev->wait_hw_ready);