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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 10:37:25 +0000 (11:37 +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>
drivers/soc/ti/pm33xx.c

index d2f5e7001a93ce69e5540d7954757e1d62640512..dc21aa855a45874eb8a0925a04dd7138d3f5dabe 100644 (file)
@@ -536,7 +536,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();
 
@@ -566,6 +566,9 @@ static int am33xx_pm_probe(struct platform_device *pdev)
 
 err_put_wkup_m3_ipc:
        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;