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

3223d9c6 · Mark Brown · 3967752a · 90cc7f1c · 3223d9c6
Commit 3223d9c6 authored Feb 04, 2015 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

sound/soc/soc-pcm.c sound/soc/soc-pcm.c +4 -3

No files found.
--- 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",
+			dev_err(cpu_dai->dev,
-				ret);
+				"ASoC: cpu DAI prepare error: %d\n", ret);
 			goto out;
 		}
 	}