Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git...

Conflicts:
	sound/soc/codecs/rt5645.c

diff --cc sound/soc/codecs/rt5645.c
index 1d821da3700482f348a51dca921dfaa2513c1c87,571e4b5895e20947acee5d8cc1e4cb8c2f2c39a0..9dfa431b337d7a0dcb79aff9cb0a1dc3d1e94704
--- 1/sound/soc/codecs/rt5645.c
--- 2/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;