From: Mark Brown <broonie@kernel.org>
Date: Fri, 1 Sep 2017 11:12:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/core' into asoc-next
X-Git-Tag: v4.14-rc4~21^2~23^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39e0a0ae6957a7eafcd3245f45f40bf822e49812;p=platform%2Fkernel%2Flinux-exynos.git

Merge remote-tracking branch 'asoc/topic/core' into asoc-next
---

39e0a0ae6957a7eafcd3245f45f40bf822e49812
diff --cc sound/soc/soc-core.c
index 3d72878,92e09cb..e4ea5d4
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -3223,11 -3217,10 +3269,11 @@@ static int snd_soc_component_initialize
  	component->remove = component->driver->remove;
  	component->suspend = component->driver->suspend;
  	component->resume = component->driver->resume;
 -	component->pcm_new = component->driver->pcm_new;
 -	component->pcm_free = component->driver->pcm_free;
 +	component->set_sysclk = component->driver->set_sysclk;
 +	component->set_pll = component->driver->set_pll;
 +	component->set_jack = component->driver->set_jack;
  
- 	dapm = &component->dapm;
+ 	dapm = snd_soc_component_get_dapm(component);
  	dapm->dev = dev;
  	dapm->component = component;
  	dapm->bias_level = SND_SOC_BIAS_OFF;