]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Revert "UBUNTU: SAUCE: mei-vsc: switch wait event to uninterruptible"
authorStefan Bader <stefan.bader@canonical.com>
Mon, 2 May 2022 09:55:38 +0000 (11:55 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 2 May 2022 10:05:40 +0000 (12:05 +0200)
BugLink: https://bugs.launchpad.net/bugs/1955383
This reverts commit 68dc29e258a3c214fa7846479259e0b607d34da5.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/misc/mei/hw-vsc.c

index d9a22de485321fcf5e6569710a5019ecab75d5a0..9a9965962dc77cee8cbefaadc99dcf631af35e5f 100644 (file)
@@ -97,8 +97,8 @@ static bool spi_need_read(struct mei_vsc_hw *hw)
 #define WAIT_FW_ASSERTED_TIMEOUT (2 * HZ)
 static int spi_xfer_wait_asserted(struct mei_vsc_hw *hw)
 {
-       wait_event_timeout(hw->xfer_wait, spi_xfer_asserted(hw),
-                          WAIT_FW_ASSERTED_TIMEOUT);
+       wait_event_interruptible_timeout(hw->xfer_wait, spi_xfer_asserted(hw),
+                                        WAIT_FW_ASSERTED_TIMEOUT);
 
        dev_dbg(&hw->spi->dev, "%s %d %d %d\n", __func__,
                atomic_read(&hw->lock_cnt),