Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: mdk-mdp: fix pm_runtime_get_sync() usage count

The pm_runtime_get_sync() internally increments the
dev->power.usage_count without decrementing it, even on errors.
Replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.

While here, fix the return contition of mtk_mdp_m2m_start_streaming(),
as it doesn't make any sense to return 0 if the PM runtime failed
to resume.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

+3 -3
+3 -3
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
··· 391 391 struct mtk_mdp_ctx *ctx = q->drv_priv; 392 392 int ret; 393 393 394 - ret = pm_runtime_get_sync(&ctx->mdp_dev->pdev->dev); 394 + ret = pm_runtime_resume_and_get(&ctx->mdp_dev->pdev->dev); 395 395 if (ret < 0) 396 - mtk_mdp_dbg(1, "[%d] pm_runtime_get_sync failed:%d", 396 + mtk_mdp_dbg(1, "[%d] pm_runtime_resume_and_get failed:%d", 397 397 ctx->id, ret); 398 398 399 - return 0; 399 + return ret; 400 400 } 401 401 402 402 static void *mtk_mdp_m2m_buf_remove(struct mtk_mdp_ctx *ctx,