Update power domains exit function calling from runtime resume
to remove function which was wrongly placed and causing crash in
device suspend and resume.
Fixes: 9e3d83c52844 ("ASoC: codecs: Add power domains support in digital macro codecs")
Signed-off-by: Srinivasa Rao Mandadapu <[email protected]>
Co-developed-by: Venkata Prasad Potturu <[email protected]>
Signed-off-by: Venkata Prasad Potturu <[email protected]>
---
sound/soc/codecs/lpass-tx-macro.c | 4 ++--
sound/soc/codecs/lpass-va-macro.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c
index b492d598..714a411 100644
--- a/sound/soc/codecs/lpass-tx-macro.c
+++ b/sound/soc/codecs/lpass-tx-macro.c
@@ -1920,6 +1920,8 @@ static int tx_macro_remove(struct platform_device *pdev)
clk_disable_unprepare(tx->npl);
clk_disable_unprepare(tx->fsgen);
+ lpass_macro_pds_exit(tx->pds);
+
return 0;
}
@@ -1964,8 +1966,6 @@ static int __maybe_unused tx_macro_runtime_resume(struct device *dev)
regcache_sync(tx->regmap);
tx->reset_swr = true;
- lpass_macro_pds_exit(tx->pds);
-
return 0;
err_fsgen:
clk_disable_unprepare(tx->npl);
diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
index 300f4f6..f3cb596 100644
--- a/sound/soc/codecs/lpass-va-macro.c
+++ b/sound/soc/codecs/lpass-va-macro.c
@@ -1503,6 +1503,8 @@ static int va_macro_remove(struct platform_device *pdev)
clk_disable_unprepare(va->dcodec);
clk_disable_unprepare(va->macro);
+ lpass_macro_pds_exit(va->pds);
+
return 0;
}
@@ -1532,8 +1534,6 @@ static int __maybe_unused va_macro_runtime_resume(struct device *dev)
regcache_cache_only(va->regmap, false);
regcache_sync(va->regmap);
- lpass_macro_pds_exit(va->pds);
-
return 0;
}
--
2.7.4
On Tue, 15 Mar 2022 20:15:31 +0530, Srinivasa Rao Mandadapu wrote:
> Update power domains exit function calling from runtime resume
> to remove function which was wrongly placed and causing crash in
> device suspend and resume.
>
>
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: codecs: Fix misplaced lpass_macro_pds_exit call
commit: 1c19601ddceda1517511e4bad3d24619e765c78c
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark