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

Commit f19c181f authored by Stuart Henderson's avatar Stuart Henderson Committed by Mark Brown
Browse files

ASoC: dapm: Make snd_soc_dapm_add/del_routes use runtime mutex subclass 



Make snd_soc_dapm_add_routes and snd_soc_dapm_del_routes use the
SND_SOC_DAPM_CLASS_RUNTIME dapm subclass to allow dynamic dapm route
updates.

Signed-off-by: default avatarStuart Henderson <stuarth@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 38b8e6f0

sound/soc/soc-dapm.c

+2 −2
Original line number Diff line number Diff line
@@ -2884,7 +2884,7 @@ int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, 
{

	int i, r, ret = 0;



	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);

	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);

	for (i = 0; i < num; i++) {

		r = snd_soc_dapm_add_route(dapm, route);

		if (r < 0) {
@@ -2915,7 +2915,7 @@ int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm, 
{

	int i;



	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);

	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);

	for (i = 0; i < num; i++) {

		snd_soc_dapm_del_route(dapm, route);

		route++;