media: amphion: apply vb2_queue_error instead of setting manually
authorMing Qian <ming.qian@nxp.com>
Tue, 1 Nov 2022 08:04:53 +0000 (16:04 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:13 +0000 (13:32 +0100)
[ Upstream commit 9d175a81e28f260916a0a13f457dd8b940eafb4e ]

vb2_queue_error is help to set the error of vb2_queue,
don't need to set it manually

Fixes: 3cd084519c6f ("media: amphion: add vpu v4l2 m2m support")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/amphion/vpu_v4l2.c

index b779e0b..4b714fa 100644 (file)
@@ -65,18 +65,11 @@ unsigned int vpu_get_buffer_state(struct vb2_v4l2_buffer *vbuf)
 
 void vpu_v4l2_set_error(struct vpu_inst *inst)
 {
-       struct vb2_queue *src_q;
-       struct vb2_queue *dst_q;
-
        vpu_inst_lock(inst);
        dev_err(inst->dev, "some error occurs in codec\n");
        if (inst->fh.m2m_ctx) {
-               src_q = v4l2_m2m_get_src_vq(inst->fh.m2m_ctx);
-               dst_q = v4l2_m2m_get_dst_vq(inst->fh.m2m_ctx);
-               src_q->error = 1;
-               dst_q->error = 1;
-               wake_up(&src_q->done_wq);
-               wake_up(&dst_q->done_wq);
+               vb2_queue_error(v4l2_m2m_get_src_vq(inst->fh.m2m_ctx));
+               vb2_queue_error(v4l2_m2m_get_dst_vq(inst->fh.m2m_ctx));
        }
        vpu_inst_unlock(inst);
 }