Skip to content

L
linux
Commit 36adf151 authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents 20694ad2 c871bd0b
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
sound/soc/soc-core.c
View file @ 36adf151
...@@ -4155,9 +4155,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, ...@@ -4155,9 +4155,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
ret = of_property_read_string_index(np, propname, ret = of_property_read_string_index(np, propname,
2 * i, &routes[i].sink); 2 * i, &routes[i].sink);
if (ret) { if (ret) {
dev_err(card->dev, "ASoC: Property '%s' index %d" dev_err(card->dev,
" could not be read: %d\n", propname, 2 * i, "ASoC: Property '%s' index %d could not be read: %d\n",
ret); propname, 2 * i, ret);
kfree(routes); kfree(routes);
return -EINVAL; return -EINVAL;
} }
...@@ -4165,8 +4165,8 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, ...@@ -4165,8 +4165,8 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
(2 * i) + 1, &routes[i].source); (2 * i) + 1, &routes[i].source);
if (ret) { if (ret) {
dev_err(card->dev, dev_err(card->dev,
"ASoC: Property '%s' index %d could not be" "ASoC: Property '%s' index %d could not be read: %d\n",
" read: %d\n", propname, (2 * i) + 1, ret); propname, (2 * i) + 1, ret);
kfree(routes); kfree(routes);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7