Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next (dbb55ce8) · Commits · 戴 / test

sound/soc/soc-core.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -3536,7 +3536,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
		const char *propname)
		{
		struct device_node *np = card->dev->of_node;
		int num_routes;
		int num_routes, old_routes;
		struct snd_soc_dapm_route *routes;
		int i, ret;

		@@ -3554,7 +3554,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
		return -EINVAL;
		}

		routes = devm_kzalloc(card->dev, num_routes * sizeof(*routes),
		old_routes = card->num_dapm_routes;
		routes = devm_kzalloc(card->dev,
		(old_routes + num_routes) * sizeof(*routes),
		GFP_KERNEL);
		if (!routes) {
		dev_err(card->dev,
		@@ -3562,9 +3564,11 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
		return -EINVAL;
		}

		memcpy(routes, card->dapm_routes, old_routes * sizeof(*routes));

		for (i = 0; i < num_routes; i++) {
		ret = of_property_read_string_index(np, propname,
		2 * i, &routes[i].sink);
		2 * i, &routes[old_routes + i].sink);
		if (ret) {
		dev_err(card->dev,
		"ASoC: Property '%s' index %d could not be read: %d\n",
		@@ -3572,7 +3576,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
		return -EINVAL;
		}
		ret = of_property_read_string_index(np, propname,
		(2 * i) + 1, &routes[i].source);
		(2 * i) + 1, &routes[old_routes + i].source);
		if (ret) {
		dev_err(card->dev,
		"ASoC: Property '%s' index %d could not be read: %d\n",
		@@ -3581,7 +3585,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;

		return 0;