[alsa-devel] [PATCH] ASoC: core: delete component->card_list in soc_remove_component only

[Pierre-Louis Bossart]

On 9/16/19 4:03 PM, Bard liao wrote:
> From: Bard Liao <yung-chuan.liao at linux.intel.com>
> 
> We add component->card_list in the end of soc_probe_component(). In
> other words, component->card_list will not be added if there is an
> error in the soc_probe_component() function. So we can't delete
> component->card_list in the error handling of soc_probe_component().
> 
> Fixes: 22d1423187e5 ("ASoC: soc-core: add soc_cleanup_component()")
> Signed-off-by: Bard Liao <yung-chuan.liao at linux.intel.com>

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>

I wish we had a way to do this on the SOF GitHub, it's painful that 
prior reviews and approvals are not tracked automagically.


> ---
>   sound/soc/soc-core.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index 35f48e9c5ead..aff4b4bf4d07 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -978,7 +978,6 @@ static void soc_cleanup_component(struct snd_soc_component *component)
>   	/* For framework level robustness */
>   	snd_soc_component_set_jack(component, NULL, NULL);
>   
> -	list_del(&component->card_list);
>   	snd_soc_dapm_free(snd_soc_component_get_dapm(component));
>   	soc_cleanup_component_debugfs(component);
>   	component->card = NULL;
> @@ -991,7 +990,7 @@ static void soc_remove_component(struct snd_soc_component *component)
>   		return;
>   
>   	snd_soc_component_remove(component);
> -
> +	list_del(&component->card_list);
>   	soc_cleanup_component(component);
>   }
>   
>