summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-15 23:56:45 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-15 23:56:45 +0900
commit36adf15107d3e74200e0ffc0f3678ee27c5376a7 (patch)
tree21c4b1130b66128804e9ab24d24e64258e139412 /sound
parent20694ad278742ed982b24117d8525f0673529f63 (diff)
parentc871bd0b2e627ff387d0ff055d8175879c80d01f (diff)
downloadlinux-36adf15107d3e74200e0ffc0f3678ee27c5376a7.tar.gz
linux-36adf15107d3e74200e0ffc0f3678ee27c5376a7.tar.bz2
linux-36adf15107d3e74200e0ffc0f3678ee27c5376a7.zip
Merge remote-tracking branch 'asoc/topic/log' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9c768bcb98a6..91d592ff67b7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4155,9 +4155,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
ret = of_property_read_string_index(np, propname,
2 * i, &routes[i].sink);
if (ret) {
- dev_err(card->dev, "ASoC: Property '%s' index %d"
- " could not be read: %d\n", propname, 2 * i,
- ret);
+ dev_err(card->dev,
+ "ASoC: Property '%s' index %d could not be read: %d\n",
+ propname, 2 * i, ret);
kfree(routes);
return -EINVAL;
}
@@ -4165,8 +4165,8 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
(2 * i) + 1, &routes[i].source);
if (ret) {
dev_err(card->dev,
- "ASoC: Property '%s' index %d could not be"
- " read: %d\n", propname, (2 * i) + 1, ret);
+ "ASoC: Property '%s' index %d could not be read: %d\n",
+ propname, (2 * i) + 1, ret);
kfree(routes);
return -EINVAL;
}