Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents 20694ad2 c871bd0b

sound/soc/soc-core.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -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, 
			(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;

		}

		}