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>

diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c
index a335e96cf53ace9efa69abc501a5a50ac7711b7b..5a13065485ab8d56c63c5405c16687d969c478ae 100644 (file)
--- a/sound/soc/codecs/hda.c
+++ b/sound/soc/codecs/hda.c
@@ -130,10 +130,8 @@ 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_dapm_free_widget(dai->playback_widget);
+                       snd_soc_dapm_free_widget(dai->capture_widget);
                        snd_soc_unregister_dai(dai);
                        break;
                }

diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index 8fe5917b1e2637ece466f89cc5d9e7da123f8039..8037b15cbdcf0326a5973b5e31edd31bbd4d6045 100644 (file)
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -1016,10 +1016,8 @@ 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_dapm_free_widget(dai->playback_widget);
+               snd_soc_dapm_free_widget(dai->capture_widget);
                snd_soc_unregister_dai(dai);
        }
 }

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index f9c4fd11853cebdac9e2d367e234a23d3ff43927..5280a1aafb92712eba835ff0ce2e44873dbf7b99 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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);
        /*