diff options
| author | Mark Brown | 2020-12-11 17:48:04 +0000 |
|---|---|---|
| committer | Mark Brown | 2020-12-11 17:48:04 +0000 |
| commit | 460aa020f56c974a3e7e5b5378b2355fec6a2c11 (patch) | |
| tree | 959dc05609eec2a040245f43964ae5738ee741cb /sound/soc/amd | |
| parent | 031616c434db05ce766f76c62865f55698e0924f (diff) | |
| parent | 84de089e770b57280d87dff51be894b6fda18810 (diff) | |
Merge remote-tracking branch 'asoc/for-5.11' into asoc-next
Diffstat (limited to 'sound/soc/amd')
| -rw-r--r-- | sound/soc/amd/acp-da7219-max98357a.c | 9 | ||||
| -rw-r--r-- | sound/soc/amd/raven/pci-acp3x.c | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index a7702e64ec51..849288d01c6b 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -73,8 +73,13 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) return ret; } - da7219_dai_wclk = clk_get(component->dev, "da7219-dai-wclk"); - da7219_dai_bclk = clk_get(component->dev, "da7219-dai-bclk"); + da7219_dai_wclk = devm_clk_get(component->dev, "da7219-dai-wclk"); + if (IS_ERR(da7219_dai_wclk)) + return PTR_ERR(da7219_dai_wclk); + + da7219_dai_bclk = devm_clk_get(component->dev, "da7219-dai-bclk"); + if (IS_ERR(da7219_dai_bclk)) + return PTR_ERR(da7219_dai_bclk); ret = snd_soc_card_jack_new(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_LINEOUT | diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 24d0f955243d..8c138e490f0c 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -235,9 +235,8 @@ static int snd_acp3x_probe(struct pci_dev *pci, } break; default: - dev_info(&pci->dev, "Invalid ACP audio mode : %d\n", val); - ret = -ENODEV; - goto disable_msi; + dev_info(&pci->dev, "ACP audio mode : %d\n", val); + break; } pm_runtime_set_autosuspend_delay(&pci->dev, 2000); pm_runtime_use_autosuspend(&pci->dev); |