]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: sti: Fix reference count leaks
authorQiushi Wu <wu000273@umn.edu>
Sun, 14 Jun 2020 03:31:06 +0000 (05:31 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:08:18 +0000 (10:08 +0100)
[ Upstream commit 6f4432bae9f2d12fc1815b5e26cc07e69bcad0df ]

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code, causing incorrect ref count if
pm_runtime_put_noidle() is not called in error handling paths.
Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.

Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/sti/hva/hva-hw.c

index 401aaafa171096436c84e687f28400fc4bfa4619..bb13348be08326dbe26f82a2b71326776493574c 100644 (file)
@@ -272,6 +272,7 @@ static unsigned long int hva_hw_get_ip_version(struct hva_dev *hva)
 
        if (pm_runtime_get_sync(dev) < 0) {
                dev_err(dev, "%s     failed to get pm_runtime\n", HVA_PREFIX);
+               pm_runtime_put_noidle(dev);
                mutex_unlock(&hva->protect_mutex);
                return -EFAULT;
        }
@@ -553,6 +554,7 @@ void hva_hw_dump_regs(struct hva_dev *hva, struct seq_file *s)
 
        if (pm_runtime_get_sync(dev) < 0) {
                seq_puts(s, "Cannot wake up IP\n");
+               pm_runtime_put_noidle(dev);
                mutex_unlock(&hva->protect_mutex);
                return;
        }