evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

Browse source
This commit is contained in:
Mark Brown 2014-12-24 12:56:32 +00:00
commit c533b8e60a
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/soc-core.c
View file

@ -3230,7 +3230,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
const char *propname) const char *propname)
{ {
struct device_node *np = card->dev->of_node; struct device_node *np = card->dev->of_node;
int num_routes, old_routes; int num_routes;
struct snd_soc_dapm_route *routes; struct snd_soc_dapm_route *routes;
int i, ret; int i, ret;
@ -3248,9 +3248,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
return -EINVAL; return -EINVAL;
} }
old_routes = card->num_dapm_routes; routes = devm_kzalloc(card->dev, num_routes * sizeof(*routes),
routes = devm_kzalloc(card->dev,
(old_routes + num_routes) * sizeof(*routes),
GFP_KERNEL); GFP_KERNEL);
if (!routes) { if (!routes) {
dev_err(card->dev, dev_err(card->dev,
@ -3258,11 +3256,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
return -EINVAL; return -EINVAL;
} }
memcpy(routes, card->dapm_routes, old_routes * sizeof(*routes));
for (i = 0; i < num_routes; i++) { for (i = 0; i < num_routes; i++) {
ret = of_property_read_string_index(np, propname, ret = of_property_read_string_index(np, propname,
2 * i, &routes[old_routes + i].sink); 2 * i, &routes[i].sink);
if (ret) { if (ret) {
dev_err(card->dev, dev_err(card->dev,
"ASoC: Property '%s' index %d could not be read: %d\n", "ASoC: Property '%s' index %d could not be read: %d\n",
@ -3270,7 +3266,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
return -EINVAL; return -EINVAL;
} }
ret = of_property_read_string_index(np, propname, ret = of_property_read_string_index(np, propname,
(2 * i) + 1, &routes[old_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 read: %d\n", "ASoC: Property '%s' index %d could not be read: %d\n",
@ -3279,7 +3275,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
} }
} }
card->num_dapm_routes += num_routes; card->num_dapm_routes = num_routes;
card->dapm_routes = routes; card->dapm_routes = routes;
return 0; return 0;