From: Mark Brown <broonie@kernel.org>
Date: Thu, 18 Jan 2018 11:55:53 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs', 'asoc... 
X-Git-Tag: v4.16-rc1~197^2~1^2~13
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/262db3bea59f5277722ae00d3a86c4230cf7af2b

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs', 'asoc/topic/disconnect', 'asoc/topic/ep93xx' and 'asoc/topic/eukrea-tlv320' into asoc-next
---

262db3bea59f5277722ae00d3a86c4230cf7af2b
diff --cc sound/soc/soc-core.c
index d3a4b58d6b7b,c0edac80df34,7b582112e3fc,345baa4f10c0,c0edac80df34,c0edac80df34..e91879569a0f
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@@@@@ -1393,16 -1392,6 -1355,6 -1392,17 -1392,6 -1392,6 +1356,17 @@@@@@@ static int soc_init_dai_link(struct snd
      	return 0;
      }
      
 ++ ++void snd_soc_disconnect_sync(struct device *dev)
 ++ ++{
 ++ ++	struct snd_soc_component *component = snd_soc_lookup_component(dev, NULL);
 ++ ++
 ++ ++	if (!component || !component->card)
 ++ ++		return;
 ++ ++
 ++ ++	snd_card_disconnect_sync(component->card->snd_card);
 ++ ++}
+++ ++EXPORT_SYMBOL_GPL(snd_soc_disconnect_sync);
 ++ ++
      /**
       * snd_soc_add_dai_link - Add a DAI link dynamically
       * @card: The ASoC card to which the DAI link is added