diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-03-21 18:19:21 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-03-21 18:19:21 +0300 |
| commit | 646b907e1559f006c79a752ee3eebe220ceb983d (patch) | |
| tree | 39e9607c0ab85af410d46d3d8edf8c8f36ea652f /sound/soc/codecs/rk817_codec.c | |
| parent | a6d4b685026cfe9837b07532db5d1e1681b5d129 (diff) | |
| parent | 49a24e9d9c740d3bd8b1200f225f67d45e3d68a5 (diff) | |
| download | linux-646b907e1559f006c79a752ee3eebe220ceb983d.tar.xz | |
Merge tag 'asoc-v5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.18
Quite a quiet release for ASoC, lots of work on drivers and platforms
but nothing too groundbreaking but not much on the core itself:
- Start of moving SoF to support multiple IPC mechanisms.
- Use of NHLT ACPI table to reduce the amount of quirking required for
Intel systems.
- Some building blocks for use in forthcoming Intel AVS driver for
legacy Intel DSP firmwares.
- Support for AMD PDM, Atmel PDMC, Awinic AW8738, i.MX cards with
TLV320AIC31xx, Intel machines with CS35L41 and ESSX8336, Mediatek
MT8181 wideband bluetooth, nVidia Tegra234, Qualcomm SC7280, Renesas
RZ/V2L, Texas Instruments TAS585M
Diffstat (limited to 'sound/soc/codecs/rk817_codec.c')
| -rw-r--r-- | sound/soc/codecs/rk817_codec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c index 03f24edfe4f6..8fffe378618d 100644 --- a/sound/soc/codecs/rk817_codec.c +++ b/sound/soc/codecs/rk817_codec.c @@ -508,12 +508,14 @@ static int rk817_platform_probe(struct platform_device *pdev) if (ret < 0) { dev_err(&pdev->dev, "%s() register codec error %d\n", __func__, ret); - goto err_; + goto err_clk; } return 0; -err_: +err_clk: + clk_disable_unprepare(rk817_codec_data->mclk); +err_: return ret; } |