diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:42:27 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:42:27 +0200 |
| commit | e9d770cf1d3448eadc124b32306674ad6087d96e (patch) | |
| tree | 34f6192c33ef2024475989ba3f124e1d37875500 /drivers/soc | |
| parent | b1bc3e6015c6b1f18d695eb45a9512dde0105cf2 (diff) | |
| parent | b0ece631f84a3e70341496b000b094b7dfdf4e5f (diff) | |
Merge tag 'v5.15.111' into 5.15-2.2.x-imx
This is the 5.15.111 stable release
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/ti/pm33xx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/soc/ti/pm33xx.c b/drivers/soc/ti/pm33xx.c index 7bab4bbaf02d..285302bf3ef9 100644 --- a/drivers/soc/ti/pm33xx.c +++ b/drivers/soc/ti/pm33xx.c @@ -527,7 +527,7 @@ static int am33xx_pm_probe(struct platform_device *pdev) ret = am33xx_pm_alloc_sram(); if (ret) - return ret; + goto err_wkup_m3_ipc_put; ret = am33xx_pm_rtc_setup(); if (ret) @@ -574,13 +574,14 @@ err_pm_runtime_put: pm_runtime_put_sync(dev); 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; +err_wkup_m3_ipc_put: + wkup_m3_ipc_put(m3_ipc); return ret; } |