diff options
| author |   Mark Brown <broonie@kernel.org> | 2014-12-24 12:56:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-24 12:56:41 +0000 |
| commit | 1521b37959c80b4c2032e39b9faffc65d5e2cb67 (patch) | |
| tree | cdb85bc855d06203b36026843ef168729b8ed989 /sound | |
| parent | Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next (diff) | |
| parent | ASoC: pcm: Fix vague codec and cpu DAI prepare error messages (diff) | |
| download | wireguard-linux-1521b37959c80b4c2032e39b9faffc65d5e2cb67.tar.xz wireguard-linux-1521b37959c80b4c2032e39b9faffc65d5e2cb67.zip | |
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-pcm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index eb87d96e2cf0..0ae0e2a9eed7 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -746,7 +746,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) codec_dai); if (ret < 0) { dev_err(codec_dai->dev, - "ASoC: DAI prepare error: %d\n", ret); + "ASoC: codec DAI prepare error: %d\n", + ret); 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) { ret = cpu_dai->driver->ops->prepare(substream, cpu_dai); if (ret < 0) { - dev_err(cpu_dai->dev, "ASoC: DAI prepare error: %d\n", - ret); + dev_err(cpu_dai->dev, + "ASoC: cpu DAI prepare error: %d\n", ret); goto out; } } |