Revert "media: v4l: Use interruptible waits"

This reverts commit a20b14a. Signed-off-by: TogoFire <togofire@mailfence.com> Change-Id: Ib4dfa6b9bd8c66a816ef7b128947692337fcade2
TogoFire · May 24, 2023 · 2550d0b · 2550d0b
1 parent 12a6eb3
commit 2550d0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -402,7 +402,7 @@ static void v4l2_m2m_cancel_job(struct v4l2_m2m_ctx *m2m_ctx)
 		if (m2m_dev->m2m_ops->job_abort)
 			m2m_dev->m2m_ops->job_abort(m2m_ctx->priv);
 		dprintk("m2m_ctx %p running, will wait to complete", m2m_ctx);
-		wait_event_interruptible(m2m_ctx->finished,
+		wait_event(m2m_ctx->finished,
 				!(m2m_ctx->job_flags & TRANS_RUNNING));
 	} else if (m2m_ctx->job_flags & TRANS_QUEUED) {
 		list_del(&m2m_ctx->queue);

diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
@@ -1571,7 +1571,7 @@ int vb2_wait_for_all_buffers(struct vb2_queue *q)
 	}
 
 	if (q->start_streaming_called)
-		wait_event_interruptible(q->done_wq, !atomic_read(&q->owned_by_drv_count));
+		wait_event(q->done_wq, !atomic_read(&q->owned_by_drv_count));
 	return 0;
 }
 EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffers);