evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next

Browse source
This commit is contained in:
Mark Brown 2014-12-24 12:56:41 +00:00
commit 1521b37959
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/soc/soc-pcm.c
View file

@ -746,7 +746,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
codec_dai); codec_dai);
if (ret < 0) { if (ret < 0) {
dev_err(codec_dai->dev, dev_err(codec_dai->dev,
"ASoC: DAI prepare error: %d\n", ret); "ASoC: codec DAI prepare error: %d\n",
ret);
goto out; goto out;
} }
} }
@ -755,8 +756,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
if (cpu_dai->driver->ops && cpu_dai->driver->ops->prepare) { if (cpu_dai->driver->ops && cpu_dai->driver->ops->prepare) {
ret = cpu_dai->driver->ops->prepare(substream, cpu_dai); ret = cpu_dai->driver->ops->prepare(substream, cpu_dai);
if (ret < 0) { if (ret < 0) {
dev_err(cpu_dai->dev, "ASoC: DAI prepare error: %d\n", dev_err(cpu_dai->dev,
ret); "ASoC: cpu DAI prepare error: %d\n", ret);
goto out; goto out;
} }
} }