diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-27 17:29:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-27 17:29:20 +0000 |
| commit | 1c521d7e62262793789845989edca57dea24eb7d (patch) | |
| tree | dd891362188494b9d665229696ffb72187998a00 /sound/soc/samsung/arndale.c | |
| parent | 8e3bb8ec11ed60963dbb70e69cf1a6806489dce3 (diff) | |
| parent | 3d2cdb854659851d991f5b8e97e847e3fd240625 (diff) | |
| download | linux-1c521d7e62262793789845989edca57dea24eb7d.tar.bz2 | |
Merge branch 'asoc-5.7' into asoc-next
Diffstat (limited to 'sound/soc/samsung/arndale.c')
| -rw-r--r-- | sound/soc/samsung/arndale.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/samsung/arndale.c b/sound/soc/samsung/arndale.c index d64602950cbd..c81ece78e036 100644 --- a/sound/soc/samsung/arndale.c +++ b/sound/soc/samsung/arndale.c @@ -21,8 +21,8 @@ static int arndale_rt5631_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); int rfs, ret; unsigned long rclk; @@ -56,7 +56,7 @@ static int arndale_wm1811_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); unsigned int rfs, rclk; /* Ensure AIF1CLK is >= 3 MHz for optimal performance */ @@ -174,7 +174,9 @@ static int arndale_audio_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(card->dev, card); if (ret) { - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "snd_soc_register_card() failed: %d\n", ret); goto err_put_of_nodes; } return 0; |