diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-24 07:56:41 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-24 07:56:41 -0500 |
commit | 1521b37959c80b4c2032e39b9faffc65d5e2cb67 (patch) | |
tree | cdb85bc855d06203b36026843ef168729b8ed989 | |
parent | cf82602c41cb3076b0d2efe92d9b080542897861 (diff) | |
parent | 90cc7f1cbbde49c0919953928c225c036ece0d9c (diff) |
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
-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) | |||
746 | codec_dai); | 746 | codec_dai); |
747 | if (ret < 0) { | 747 | if (ret < 0) { |
748 | dev_err(codec_dai->dev, | 748 | dev_err(codec_dai->dev, |
749 | "ASoC: DAI prepare error: %d\n", ret); | 749 | "ASoC: codec DAI prepare error: %d\n", |
750 | ret); | ||
750 | goto out; | 751 | goto out; |
751 | } | 752 | } |
752 | } | 753 | } |
@@ -755,8 +756,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) | |||
755 | if (cpu_dai->driver->ops && cpu_dai->driver->ops->prepare) { | 756 | if (cpu_dai->driver->ops && cpu_dai->driver->ops->prepare) { |
756 | ret = cpu_dai->driver->ops->prepare(substream, cpu_dai); | 757 | ret = cpu_dai->driver->ops->prepare(substream, cpu_dai); |
757 | if (ret < 0) { | 758 | if (ret < 0) { |
758 | dev_err(cpu_dai->dev, "ASoC: DAI prepare error: %d\n", | 759 | dev_err(cpu_dai->dev, |
759 | ret); | 760 | "ASoC: cpu DAI prepare error: %d\n", ret); |
760 | goto out; | 761 | goto out; |
761 | } | 762 | } |
762 | } | 763 | } |