Skip to content

Commit

Permalink
ASoC: codecs: Fix misplaced lpass_macro_pds_exit call
Browse files Browse the repository at this point in the history
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: 9e3d83c ("ASoC: codecs: Add power domains support in digital macro codecs")
Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Co-developed-by: Venkata Prasad Potturu <quic_potturu@quicinc.com>
Signed-off-by: Venkata Prasad Potturu <quic_potturu@quicinc.com>
Link: https://lore.kernel.org/r/1647355531-4150-1-git-send-email-quic_srivasam@quicinc.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Srinivasa Rao Mandadapu authored and Mark Brown committed Mar 16, 2022
1 parent 455c565 commit 1c19601
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions sound/soc/codecs/lpass-tx-macro.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/lpass-va-macro.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 1c19601

Please sign in to comment.