diff options
| author | Mark Brown <broonie@kernel.org> | 2021-04-28 17:33:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-28 17:33:54 +0100 |
| commit | 9a5e12be6a46493e9602b1714e57aaef85fbaa01 (patch) | |
| tree | 7e1c01eb90ea959085dfebbb1a91d971a691ea58 /sound | |
| parent | 6879e8e759bf9e05eaee85e32ca1a936e6b46da1 (diff) | |
| parent | 97c733654ab4a5ac910216b4b74e605acf3e1cce (diff) | |
| download | linux-stable-9a5e12be6a46493e9602b1714e57aaef85fbaa01.tar.gz linux-stable-9a5e12be6a46493e9602b1714e57aaef85fbaa01.tar.bz2 linux-stable-9a5e12be6a46493e9602b1714e57aaef85fbaa01.zip | |
Merge series "ASoC: Revert clk_hw_get_clk() cleanup" from Jerome Brunet <jbrunet@baylibre.com>:
There is problem with clk_hw_get_hw(). Using it pins the clock provider to
itself, making it impossible to remove the related module.
Revert the two commits using this function until this gets sorted out.
Jerome Brunet (2):
ASoC: stm32: do not request a new clock consummer reference
ASoC: da7219: do not request a new clock consummer reference
sound/soc/codecs/da7219.c | 5 +----
sound/soc/stm/stm32_sai_sub.c | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
--
2.31.1
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/da7219.c | 5 | ||||
| -rw-r--r-- | sound/soc/stm/stm32_sai_sub.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index bd3c523a8617..13009d08b09a 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -2181,10 +2181,7 @@ static int da7219_register_dai_clks(struct snd_soc_component *component) ret); goto err; } - - da7219->dai_clks[i] = devm_clk_hw_get_clk(dev, dai_clk_hw, NULL); - if (IS_ERR(da7219->dai_clks[i])) - return PTR_ERR(da7219->dai_clks[i]); + da7219->dai_clks[i] = dai_clk_hw->clk; /* For DT setup onecell data, otherwise create lookup */ if (np) { diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index c1561237ee24..3aa1cf262402 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -484,10 +484,7 @@ static int stm32_sai_add_mclk_provider(struct stm32_sai_sub_data *sai) dev_err(dev, "mclk register returned %d\n", ret); return ret; } - - sai->sai_mclk = devm_clk_hw_get_clk(dev, hw, NULL); - if (IS_ERR(sai->sai_mclk)) - return PTR_ERR(sai->sai_mclk); + sai->sai_mclk = hw->clk; /* register mclk provider */ return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); |