diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:05 +0000 |
| commit | 3223d9c62c536677aa826ff42e22fafa672bf266 (patch) | |
| tree | 4b41c5ef7fe2e1513ecc1855d2da794e58eb47a2 /sound/soc | |
| parent | 3967752a578441a88cb905c3ccdecd7c502eb932 (diff) | |
| parent | 90cc7f1cbbde49c0919953928c225c036ece0d9c (diff) | |
| download | op-kernel-dev-3223d9c62c536677aa826ff42e22fafa672bf266.zip op-kernel-dev-3223d9c62c536677aa826ff42e22fafa672bf266.tar.gz | |
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
Diffstat (limited to 'sound/soc')
| -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 eb87d96e2..0ae0e2a 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; } } |
