Merge branch 'for-5.14/intel-ish' into for-linus

[linux-block.git] / drivers / hid / intel-ish-hid / ipc / pci-ish.c

diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index a6d5173ac0030035a8b33ed1acc1b19f4ee719d6..1c5039081db2786474d8cdc9846f0f18bba58090 100644 (file)
--- 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));