diff options
| author |   Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-07-13 15:51:31 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-07-13 15:51:31 -0400 |
| commit | d5bfbad214369f543958a1c6c55fa805e3f14976 (patch) | |
| tree | 259bcb334acf9607d590721a5a5d3727b3dda769 /drivers/hid/intel-ish-hid/ipc/pci-ish.c | |
| parent | drm/i915/display/xelpd: Extend Wa_14011508470 (diff) | |
| parent | Linux 5.14-rc1 (diff) | |
| download | linux-dev-d5bfbad214369f543958a1c6c55fa805e3f14976.tar.xz linux-dev-d5bfbad214369f543958a1c6c55fa805e3f14976.zip | |
Merge drm/drm-next into drm-intel-next
Catching up with 5.14-rc1
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/hid/intel-ish-hid/ipc/pci-ish.c')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ipc/pci-ish.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c index a6d5173ac003..1c5039081db2 100644 --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c @@ -263,7 +263,6 @@ static void __maybe_unused ish_resume_handler(struct work_struct *work) struct pci_dev *pdev = to_pci_dev(ish_resume_device); struct ishtp_device *dev = pci_get_drvdata(pdev); uint32_t fwsts = dev->ops->get_fw_status(dev); - int ret; if (ish_should_leave_d0i3(pdev) && !dev->suspend_flag && IPC_IS_ISH_ILUP(fwsts)) { @@ -275,7 +274,7 @@ static void __maybe_unused ish_resume_handler(struct work_struct *work) /* Waiting to get resume response */ if (dev->resume_flag) - ret = wait_event_interruptible_timeout(dev->resume_wait, + wait_event_interruptible_timeout(dev->resume_wait, !dev->resume_flag, msecs_to_jiffies(WAIT_FOR_RESUME_ACK_MS)); |