diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 09:56:45 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 09:56:45 -0500 |
| commit | 36adf15107d3e74200e0ffc0f3678ee27c5376a7 (patch) | |
| tree | 21c4b1130b66128804e9ab24d24e64258e139412 /sound | |
| parent | 20694ad278742ed982b24117d8525f0673529f63 (diff) | |
| parent | c871bd0b2e627ff387d0ff055d8175879c80d01f (diff) | |
Merge remote-tracking branch 'asoc/topic/log' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 10 |
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, | |||
| 4155 | ret = of_property_read_string_index(np, propname, | 4155 | ret = of_property_read_string_index(np, propname, |
| 4156 | 2 * i, &routes[i].sink); | 4156 | 2 * i, &routes[i].sink); |
| 4157 | if (ret) { | 4157 | if (ret) { |
| 4158 | dev_err(card->dev, "ASoC: Property '%s' index %d" | 4158 | dev_err(card->dev, |
| 4159 | " could not be read: %d\n", propname, 2 * i, | 4159 | "ASoC: Property '%s' index %d could not be read: %d\n", |
| 4160 | ret); | 4160 | propname, 2 * i, ret); |
| 4161 | kfree(routes); | 4161 | kfree(routes); |
| 4162 | return -EINVAL; | 4162 | return -EINVAL; |
| 4163 | } | 4163 | } |
| @@ -4165,8 +4165,8 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, | |||
| 4165 | (2 * i) + 1, &routes[i].source); | 4165 | (2 * i) + 1, &routes[i].source); |
| 4166 | if (ret) { | 4166 | if (ret) { |
| 4167 | dev_err(card->dev, | 4167 | dev_err(card->dev, |
| 4168 | "ASoC: Property '%s' index %d could not be" | 4168 | "ASoC: Property '%s' index %d could not be read: %d\n", |
| 4169 | " read: %d\n", propname, (2 * i) + 1, ret); | 4169 | propname, (2 * i) + 1, ret); |
| 4170 | kfree(routes); | 4170 | kfree(routes); |
| 4171 | return -EINVAL; | 4171 | return -EINVAL; |
| 4172 | } | 4172 | } |