Skip to contentSkip to conversation

ASoC: pcm: Fix vague codec and cpu DAI prepare error messages

PATCH Applied Jarkko Nikula 2 participants 2 messages Dec 23, 2014 – Dec 24, 2014

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/1 ASoC: pcm: Fix vague codec and cpu DAI prepare error messages

Both codec and cpu DAI prepare print the same error message making it a bit more difficult to grep quickly from sources. Fix this by telling it explicitly.

Signed-off-by Jarkko Nikula <[email protected]>
---
 sound/soc/soc-pcm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/soc-pcm.c +4 -3
index eb87d96e2cf0..0ae0e2a9eed7 100644
@@ -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;
 		}
 	}
Signature · 1 line
2.1.3
maintainer Applied
#1 lore raw
Quoted 3 lines · Jarkko Nikula

Both codec and cpu DAI prepare print the same error message making it a bit more difficult to grep quickly from sources. Fix this by telling it explicitly.

Applied, thanks.