summaryrefslogtreecommitdiff
path: root/sound/soc/intel/boards
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-05-06 13:58:24 +0300
committerMark Brown <broonie@kernel.org>2015-05-06 13:58:24 +0300
commit292d2497cd8f551642a38f7a55b1b7965049c75d (patch)
tree1332204457623c47341dffbcd4ff33bf83599d47 /sound/soc/intel/boards
parent26f63c692f012ff665a8fd085a36549fe734f59f (diff)
parent177e1e1fbc63f6e4ac0fab56dcb61bb8c8597681 (diff)
downloadlinux-292d2497cd8f551642a38f7a55b1b7965049c75d.tar.xz
Merge branch 'topic/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/boards')
-rw-r--r--sound/soc/intel/boards/cht_bsw_rt5645.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index 7d23ead3fd40..8f96c21fef4f 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -214,7 +214,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
return ret;
}
- rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack);
+ rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack, NULL);
return ret;
}