From: Mark Brown <broonie@kernel.org>
Date: Fri, 12 Jan 2018 12:29:05 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/da7218', 'asoc/topic/dai-drv', 'asoc/topic... 
X-Git-Tag: v4.16-rc1~197^2~10^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da7b34f80edfd7fe81ca6d13ab5493e559e01e8b;p=thirdparty%2Fkernel%2Flinux.git

Merge remote-tracking branches 'asoc/topic/da7218', 'asoc/topic/dai-drv', 'asoc/topic/davinci', 'asoc/topic/disconnect' and 'asoc/topic/ep93xx' into asoc-next
---

da7b34f80edfd7fe81ca6d13ab5493e559e01e8b
diff --cc sound/soc/soc-core.c
index 724b35671aa6b,c0edac80df34e,6a13fbcba23f3,c0edac80df34e,345baa4f10c0d,c0edac80df34e..d1f7e639d5b1c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@@@@@ -1392,16 -1392,6 -1392,6 -1392,6 -1392,17 -1392,6 +1392,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