From: Mark Brown <broonie@kernel.org>
Date: Tue, 7 Jul 2015 14:04:40 +0000 (+0100)
Subject: Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2a763858a7d0236d658116918c7b1e2c7a5e0cf;p=linux-beck.git

Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5645

Conflicts:
	sound/soc/codecs/rt5645.c
---

f2a763858a7d0236d658116918c7b1e2c7a5e0cf
diff --cc sound/soc/codecs/rt5645.c
index 1d821da37004,571e4b5895e2..9dfa431b337d
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@@ -3051,10 -3040,7 +3042,10 @@@ static int rt5645_probe(struct snd_soc_
  
  	switch (rt5645->codec_type) {
  	case CODEC_TYPE_RT5645:
- 		snd_soc_dapm_new_controls(&codec->dapm,
++		snd_soc_dapm_new_controls(dapm,
 +			rt5645_specific_dapm_widgets,
 +			ARRAY_SIZE(rt5645_specific_dapm_widgets));
- 		snd_soc_dapm_add_routes(&codec->dapm,
+ 		snd_soc_dapm_add_routes(dapm,
  			rt5645_specific_dapm_routes,
  			ARRAY_SIZE(rt5645_specific_dapm_routes));
  		break;