Unverified Commit c196b412 authored Oct 19, 2022 by Kuninori Morimoto Committed by Mark Brown Oct 19, 2022

ASoC: soc-dapm.c: ignore parameter NULL at snd_soc_dapm_free_widget()



Currently snd_soc_dapm_free_widget() is assuming input parameter is
non NULL. Thus, caller need to care about it.
This patch care it at snd_soc_dapm_free_widget().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/875yggtzsq.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 943402b5

sound/soc/codecs/hda.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -130,9 +130,7 @@ static void hda_codec_unregister_dais(struct hda_codec *codec,
		if (strcmp(dai->driver->name, pcm->name))
		continue;

		if (dai->playback_widget)
		snd_soc_dapm_free_widget(dai->playback_widget);
		if (dai->capture_widget)
		snd_soc_dapm_free_widget(dai->capture_widget);
		snd_soc_unregister_dai(dai);
		break;

sound/soc/intel/avs/pcm.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1016,9 +1016,7 @@ static void avs_component_hda_unregister_dais(struct snd_soc_component *componen
		if (!strstr(dai->driver->name, name))
		continue;

		if (dai->playback_widget)
		snd_soc_dapm_free_widget(dai->playback_widget);
		if (dai->capture_widget)
		snd_soc_dapm_free_widget(dai->capture_widget);
		snd_soc_unregister_dai(dai);
		}

sound/soc/soc-dapm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2489,6 +2489,9 @@ void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w)
		struct snd_soc_dapm_path p, next_p;
		enum snd_soc_dapm_direction dir;

		if (!w)
		return;

		list_del(&w->list);
		list_del(&w->dirty);
		/*