diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-27 20:29:20 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-27 20:29:20 +0300 |
| commit | 1c521d7e62262793789845989edca57dea24eb7d (patch) | |
| tree | dd891362188494b9d665229696ffb72187998a00 /sound/soc/samsung/smdk_wm8994.c | |
| parent | 8e3bb8ec11ed60963dbb70e69cf1a6806489dce3 (diff) | |
| parent | 3d2cdb854659851d991f5b8e97e847e3fd240625 (diff) | |
| download | linux-1c521d7e62262793789845989edca57dea24eb7d.tar.xz | |
Merge branch 'asoc-5.7' into asoc-next
Diffstat (limited to 'sound/soc/samsung/smdk_wm8994.c')
| -rw-r--r-- | sound/soc/samsung/smdk_wm8994.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 28f8be000aa1..a9f345f19a8a 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -45,7 +45,7 @@ static int smdk_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 pll_out; int ret; @@ -178,7 +178,7 @@ static int smdk_audio_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret) + if (ret && ret != -EPROBE_DEFER) dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret); return ret; |