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

Commit 98409bfd authored by Mark Brown's avatar Mark Brown
Browse files

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

parents dfc956d8 1a7aaa58

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm, 
int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,

			     const struct snd_soc_dapm_route *route, int num);

void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);

void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm);



/* dapm events */

void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,

sound/soc/soc-core.c

+3 −3
Original line number Diff line number Diff line
@@ -795,12 +795,12 @@ static void soc_resume_deferred(struct work_struct *work) 


	dev_dbg(card->dev, "ASoC: resume work completed\n");



	/* userspace can access us now we are back as we were before */

	snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D0);



	/* Recheck all endpoints too, their state is affected by suspend */

	dapm_mark_endpoints_dirty(card);

	snd_soc_dapm_sync(&card->dapm);



	/* userspace can access us now we are back as we were before */

	snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D0);

}



/* powers up audio subsystem after a suspend */

sound/soc/soc-dapm.c

+7 −0
Original line number Diff line number Diff line
@@ -2293,6 +2293,12 @@ void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w) 
	kfree(w);

}



void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm)

{

	dapm->path_sink_cache.widget = NULL;

	dapm->path_source_cache.widget = NULL;

}



/* free all dapm widgets and resources */

static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)

{
@@ -2303,6 +2309,7 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) 
			continue;

		snd_soc_dapm_free_widget(w);

	}

	snd_soc_dapm_reset_cache(dapm);

}



static struct snd_soc_dapm_widget *dapm_find_widget(

sound/soc/soc-topology.c

+1 −0
Original line number Diff line number Diff line
@@ -1805,6 +1805,7 @@ void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm, 
		snd_soc_tplg_widget_remove(w);

		snd_soc_dapm_free_widget(w);

	}

	snd_soc_dapm_reset_cache(dapm);

}

EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_remove_all);