Merge drm/drm-next into drm-misc-next

[linux-2.6-block.git] / drivers / accel / ivpu / ivpu_ipc.c

diff --git a/drivers/accel/ivpu/ivpu_ipc.c b/drivers/accel/ivpu/ivpu_ipc.c
index 618dbc17df801cfbc3f56a2d835f26fab7ba2733..88453762c9d53bbab79dd3fca0e27aff638c5c14 100644 (file)
--- a/drivers/accel/ivpu/ivpu_ipc.c
+++ b/drivers/accel/ivpu/ivpu_ipc.c
@@ -227,9 +227,9 @@ int ivpu_ipc_receive(struct ivpu_device *vdev, struct ivpu_ipc_consumer *cons,
        struct ivpu_ipc_rx_msg *rx_msg;
        int wait_ret, ret = 0;
 
-       wait_ret = wait_event_interruptible_timeout(cons->rx_msg_wq,
-                                                   ivpu_ipc_rx_need_wakeup(cons),
-                                                   msecs_to_jiffies(timeout_ms));
+       wait_ret = wait_event_timeout(cons->rx_msg_wq,
+                                     ivpu_ipc_rx_need_wakeup(cons),
+                                     msecs_to_jiffies(timeout_ms));
 
        if (IS_KTHREAD() && kthread_should_stop())
                return -EINTR;
@@ -237,9 +237,6 @@ int ivpu_ipc_receive(struct ivpu_device *vdev, struct ivpu_ipc_consumer *cons,
        if (wait_ret == 0)
                return -ETIMEDOUT;
 
-       if (wait_ret < 0)
-               return -ERESTARTSYS;
-
        spin_lock_irq(&cons->rx_msg_lock);
        rx_msg = list_first_entry_or_null(&cons->rx_msg_list, struct ivpu_ipc_rx_msg, link);
        if (!rx_msg) {