]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: media: rkvdec: fix pm_runtime_get_sync() usage count
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 23 Apr 2021 15:19:11 +0000 (17:19 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:55:48 +0000 (16:55 +0200)
[ 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

index 1263991de76f9ea07fa46d06f1311247c3249177..b630e161d4cef51b33a54254837cc0ea726e4cdf 100644 (file)
@@ -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;