| From 5314f70f5c28a5edeef0744b4e35ac593044346c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 23 Apr 2021 17:19:10 +0200 |
| Subject: media: sunxi: fix pm_runtime_get_sync() usage count |
| |
| From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| |
| [ Upstream commit 9c298f82d8392f799a0595f50076afa1d91e9092 ] |
| |
| 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: 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/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c |
| index 3f81dd17755c..fbcca59a0517 100644 |
| --- a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c |
| +++ b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c |
| @@ -494,7 +494,7 @@ static int rotate_start_streaming(struct vb2_queue *vq, unsigned int count) |
| struct device *dev = ctx->dev->dev; |
| int ret; |
| |
| - ret = pm_runtime_get_sync(dev); |
| + ret = pm_runtime_resume_and_get(dev); |
| if (ret < 0) { |
| dev_err(dev, "Failed to enable module\n"); |
| |
| -- |
| 2.30.2 |
| |
