Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / media / platform / mtk-mdp / mtk_mdp_m2m.c

diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
index ace4528cdc5ef6168375d4e64c560e980c03e829..f14779e7596e51057079472bf57588813ff3c39d 100644 (file)
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
@@ -391,12 +391,12 @@ static int mtk_mdp_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
        struct mtk_mdp_ctx *ctx = q->drv_priv;
        int ret;
 
-       ret = pm_runtime_get_sync(&ctx->mdp_dev->pdev->dev);
+       ret = pm_runtime_resume_and_get(&ctx->mdp_dev->pdev->dev);
        if (ret < 0)
-               mtk_mdp_dbg(1, "[%d] pm_runtime_get_sync failed:%d",
+               mtk_mdp_dbg(1, "[%d] pm_runtime_resume_and_get failed:%d",
                            ctx->id, ret);
 
-       return 0;
+       return ret;
 }
 
 static void *mtk_mdp_m2m_buf_remove(struct mtk_mdp_ctx *ctx,