Merge tag 'irq-core-2021-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / staging / media / hantro / hantro_g1_h264_dec.c

diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
index 845bef7..5c792b7 100644 (file)
--- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c
+++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
@@ -273,13 +273,15 @@ static void set_buffers(struct hantro_ctx *ctx)
        vdpu_write_relaxed(vpu, ctx->h264_dec.priv.dma, G1_REG_ADDR_QTABLE);
 }
 
-void hantro_g1_h264_dec_run(struct hantro_ctx *ctx)
+int hantro_g1_h264_dec_run(struct hantro_ctx *ctx)
 {
        struct hantro_dev *vpu = ctx->dev;
+       int ret;
 
        /* Prepare the H264 decoder context. */
-       if (hantro_h264_dec_prepare_run(ctx))
-               return;
+       ret = hantro_h264_dec_prepare_run(ctx);
+       if (ret)
+               return ret;
 
        /* Configure hardware registers. */
        set_params(ctx);
@@ -301,4 +303,6 @@ void hantro_g1_h264_dec_run(struct hantro_ctx *ctx)
                           G1_REG_CONFIG_DEC_CLK_GATE_E,
                           G1_REG_CONFIG);
        vdpu_write(vpu, G1_REG_INTERRUPT_DEC_E, G1_REG_INTERRUPT);
+
+       return 0;
 }