From: Mark Brown <broonie@kernel.org>
Date: Wed, 25 Dec 2019 17:51:43 +0000 (+0000)
Subject: Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v5.6-rc1~42^2~3^2~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a82cf72f94af1135f2edde0a244499af390f333a;p=thirdparty%2Flinux.git

Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.6
---

a82cf72f94af1135f2edde0a244499af390f333a
diff --cc sound/soc/soc-topology.c
index 2b3c74a0b1269,92e4f4d08bfad..69d6a52d00667
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@@ -549,9 -549,7 +549,8 @@@ static void remove_link(struct snd_soc_
  		dobj->ops->link_unload(comp, dobj);
  
  	list_del(&dobj->list);
- 
 -	snd_soc_remove_dai_link(comp->card, link);
 +	snd_soc_remove_pcm_runtime(comp->card,
 +			snd_soc_get_pcm_runtime(comp->card, link));
  
  	kfree(link->name);
  	kfree(link->stream_name);