| From 9c7a6e57556ae446fc085f5fed3f71ad0f1ab0c0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 23 Apr 2021 17:19:10 +0200 |
| Subject: media: s5p-jpeg: fix pm_runtime_get_sync() usage count |
| |
| From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| |
| [ Upstream commit 10343de268d10cf07b092b8b525e12ad558ead77 ] |
| |
| 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. |
| |
| As a plus, pm_runtime_resume_and_get() doesn't return |
| positive numbers, so the return code validation can |
| be removed. |
| |
| Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> |
| Acked-by: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c |
| index 9b22dd8e34f4..d515eb08c3ee 100644 |
| --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c |
| +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c |
| @@ -2566,11 +2566,8 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb) |
| static int s5p_jpeg_start_streaming(struct vb2_queue *q, unsigned int count) |
| { |
| struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(q); |
| - int ret; |
| - |
| - ret = pm_runtime_get_sync(ctx->jpeg->dev); |
| |
| - return ret > 0 ? 0 : ret; |
| + return pm_runtime_resume_and_get(ctx->jpeg->dev); |
| } |
| |
| static void s5p_jpeg_stop_streaming(struct vb2_queue *q) |
| -- |
| 2.30.2 |
| |
