]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: rcar-vin: Fix a reference count leak.
authorQiushi Wu <wu000273@umn.edu>
Sat, 13 Jun 2020 22:30:08 +0000 (00:30 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:23 +0000 (10:07 +0100)
[ Upstream commit aaffa0126a111d65f4028c503c76192d4cc93277 ]

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus call pm_runtime_put_noidle()
if pm_runtime_get_sync() fails.

Fixes: 90dedce9bc54 ("media: rcar-vin: add function to manipulate Gen3 chsel value")
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/rcar-vin/rcar-dma.c

index 1a30cd03637116be3bf52fd0e2d7ecc0052acd86..95bc9e0e87926daebd2fc3042d821cf0cf2ed708 100644 (file)
@@ -1392,8 +1392,10 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel)
        int ret;
 
        ret = pm_runtime_get_sync(vin->dev);
-       if (ret < 0)
+       if (ret < 0) {
+               pm_runtime_put_noidle(vin->dev);
                return ret;
+       }
 
        /* Make register writes take effect immediately. */
        vnmc = rvin_read(vin, VNMC_REG);