]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
soc: ti: pm33xx: Fix some resource leak in the error handling paths of the probe...
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Mon, 25 Jan 2021 04:51:36 +0000 (20:51 -0800)
committerAndrea Righi <andrea.righi@canonical.com>
Mon, 15 Mar 2021 14:08:54 +0000 (15:08 +0100)
[ Upstream commit 17ad4662595ea0c4fd7496b664523ef632e63349 ]

'am33xx_pm_rtc_setup()' allocates some resources that must be freed on the
error. Commit 2152fbbd47c0 ("soc: ti: pm33xx: Simplify RTC usage to prepare
to drop platform data") has introduced the use of these resources but has
only updated the remove function.

Fix the error handling path of the probe function now.

Fixes: 2152fbbd47c0 ("soc: ti: pm33xx: Simplify RTC usage to prepare to drop platform data")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
drivers/soc/ti/pm33xx.c

index 64f3e3105540148bef37f29f8a3167e5150ab944..7bab4bbaf02dc7873d9002311457f17570caf382 100644 (file)
@@ -535,7 +535,7 @@ static int am33xx_pm_probe(struct platform_device *pdev)
 
        ret = am33xx_push_sram_idle();
        if (ret)
-               goto err_free_sram;
+               goto err_unsetup_rtc;
 
        am33xx_pm_set_ipc_ops();
 
@@ -575,6 +575,9 @@ err_pm_runtime_put:
 err_pm_runtime_disable:
        pm_runtime_disable(dev);
        wkup_m3_ipc_put(m3_ipc);
+err_unsetup_rtc:
+       iounmap(rtc_base_virt);
+       clk_put(rtc_fck);
 err_free_sram:
        am33xx_pm_free_sram();
        pm33xx_dev = NULL;