media: vpss: clean up resources in init

[ Upstream commit 9c487b0b0ea7ff22127fe99a7f67657d8730ff94 ]

If platform_driver_register() fails within vpss_init() resources are not
cleaned up. The patch fixes this issue by introducing the corresponding
error handling.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Evgeny Novikov <novikov@ispras.ru>
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>

diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
index 2ee4cd9e6d80f74e01500dd1f987a44b8ad64bf8..d984f45c03149d093e563d854a4b447f40e78b8f 100644 (file)
--- a/drivers/media/platform/davinci/vpss.c
+++ b/drivers/media/platform/davinci/vpss.c
@@ -514,19 +514,31 @@ static void vpss_exit(void)
 
 static int __init vpss_init(void)
 {
+       int ret;
+
        if (!request_mem_region(VPSS_CLK_CTRL, 4, "vpss_clock_control"))
                return -EBUSY;
 
        oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4);
        if (unlikely(!oper_cfg.vpss_regs_base2)) {
-               release_mem_region(VPSS_CLK_CTRL, 4);
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto err_ioremap;
        }
 
        writel(VPSS_CLK_CTRL_VENCCLKEN |
-                    VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);
+              VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);
+
+       ret = platform_driver_register(&vpss_driver);
+       if (ret)
+               goto err_pd_register;
+
+       return 0;
 
-       return platform_driver_register(&vpss_driver);
+err_pd_register:
+       iounmap(oper_cfg.vpss_regs_base2);
+err_ioremap:
+       release_mem_region(VPSS_CLK_CTRL, 4);
+       return ret;
 }
 subsys_initcall(vpss_init);
 module_exit(vpss_exit);