| From 19d4a430f5a3b45a9ff0665d2fd02b2168cbeee3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 23 Apr 2021 17:19:11 +0200 |
| Subject: staging: media: rkvdec: fix pm_runtime_get_sync() usage count |
| |
| From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| |
| [ Upstream commit e90812c47b958407b54d05780dc483fdc1b57a93 ] |
| |
| 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. |
| |
| Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> |
| Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/staging/media/rkvdec/rkvdec.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c |
| index 1263991de76f..b630e161d4ce 100644 |
| --- a/drivers/staging/media/rkvdec/rkvdec.c |
| +++ b/drivers/staging/media/rkvdec/rkvdec.c |
| @@ -691,7 +691,7 @@ static void rkvdec_device_run(void *priv) |
| if (WARN_ON(!desc)) |
| return; |
| |
| - ret = pm_runtime_get_sync(rkvdec->dev); |
| + ret = pm_runtime_resume_and_get(rkvdec->dev); |
| if (ret < 0) { |
| rkvdec_job_finish_no_pm(ctx, VB2_BUF_STATE_ERROR); |
| return; |
| -- |
| 2.30.2 |
| |
